From a703fe85ded165f9ba6e42613262595ada070fec Mon Sep 17 00:00:00 2001
From: Athanasios Oikonomou <athoik@gmail.com>
Date: Sun, 26 Jan 2014 20:13:42 +0200
Subject: [PATCH 1/2] Update stream.xml and add new menu entry update bouquet

stream.xml type now has a fourth paramater the EPG id
Plugin now supports updating greekstream.tv bouquet (ony when exists) based on stream.xml stored on local machine
---
 plugin/plugin.py  |  39 ++-
 plugin/stream.xml | 637 ++++++++++++++++++++++++----------------------
 2 files changed, 374 insertions(+), 302 deletions(-)

diff --git a/plugin/plugin.py b/plugin/plugin.py
index add3f7c..923ba65 100644
--- a/plugin/plugin.py
+++ b/plugin/plugin.py
@@ -11,6 +11,9 @@
 url_sc = "/usr/lib/enigma2/python/Plugins/Extensions/GreekStreamTV/update.sh"
 url_pd = "/usr/lib/enigma2/python/Plugins/Extensions/GreekStreamTV/depends.sh"
 
+GSXML = "/usr/lib/enigma2/python/Plugins/Extensions/GreekStreamTV/stream.xml"
+GSBQ = "/etc/enigma2/userbouquet.greekstreamtv.tv"
+
 def menu(menuid, **kwargs):
     if menuid == "mainmenu":
         return [("GreekStreamTV", main, "GreekStreamTV", 33)]
@@ -49,9 +52,11 @@ def __init__(self, session):
         self.session = session
         menu = []
         if path.isdir("/usr/lib/enigma2/python/Plugins/Extensions/GreekStreamTV"):
-            menu.append((_("GreekStreamTV"),"/usr/lib/enigma2/python/Plugins/Extensions/GreekStreamTV/stream.xml"))
+            menu.append((_("GreekStreamTV"), GSXML))
             menu.extend(self.getStreams())
             menu.append((_("Update Greek Stations"), "update"))
+            if path.isfile(GSBQ):
+                menu.append((_("Update Bouquet"), "updatebq"))
             menu.append((_("Install Dependencies"), "depends"))
             menu.append((_("About..."), "about"))
             self["menu"] = MenuList(menu)
@@ -72,6 +77,17 @@ def go(self):
                     self.session.open(MessageBox, tmpMessage, MessageBox.TYPE_INFO)
             elif choice == "update":
                 self.session.openWithCallback(self.update, MessageBox,_("Confirm your selection, or exit"), MessageBox.TYPE_YESNO)
+            elif choice == "updatebq":
+                try:
+                    self.updatebq()
+                    from enigma import eDVBDB
+                    eDVBDB.getInstance().reloadBouquets()
+                    eDVBDB.getInstance().reloadServicelist()
+                    tmpMessage = "GreekStreamTV bouquet updated successfully..."
+                except Exception as err:
+                    print "[GreekStreamTV::PluginMenu] Exception: ", str(err)
+                    tmpMessage = "GreekStreamTV bouquet update failed..."
+                self.session.open(MessageBox, tmpMessage, MessageBox.TYPE_INFO)
             elif choice == "depends":
                 self.session.openWithCallback(self.depends, MessageBox,_("Confirm your selection, or exit"), MessageBox.TYPE_YESNO)
             elif choice == "about":
@@ -80,6 +96,27 @@ def go(self):
                 tmpMessage += "GreekStreamTV is free and source code included."
                 self.session.open(MessageBox, tmpMessage, MessageBox.TYPE_INFO)
 
+    def updatebq(self):
+        from xml.etree.cElementTree import ElementTree
+        tree = ElementTree()
+        tree.parse(GSXML)
+        tvlist = []
+        for iptv in tree.findall("iptv"):
+            name = iptv.findtext("name").title()
+            (protocol, serviceType, bufferSize, epgId) = iptv.findtext("type").split(":")
+            uri = iptv.findtext("uri")
+            if protocol in "livestreamer":
+                uri = "http://127.1:88/" + uri
+            uri = uri.replace(":", "%3a")
+            service = "#SERVICE {s}:0:1:{e}:{e}:0:0:0:0:0:{u}:{n}\n".format(s=serviceType,e=epgId,u=uri,n=name)
+            tvlist.append((name,service))
+
+        tvlist=sorted(tvlist, key=lambda channel: channel[0]) #sort by name
+        with open(GSBQ, "w") as f:
+            f.write("#NAME GreekStreamTV\n")
+            for (name, service) in tvlist:
+                f.write(service)
+
     def update(self, answer):
         if answer:
             self.session.open(Console,_("Install "),["%s update" % url_sc])
diff --git a/plugin/stream.xml b/plugin/stream.xml
index 8dd7e7b..f700595 100644
--- a/plugin/stream.xml
+++ b/plugin/stream.xml
@@ -2,386 +2,338 @@
 <stream>
 
 <iptv>
-	<name>[Gr] 0-6</name>
+	<name>4E TV {rtmp}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>http://livestream.com/06television</uri>
-</iptv>
-
-<iptv>
-	<name>[Gr] 4E TV</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://82.192.84.30:1935/live/myStream.sdp</uri>
 </iptv>
-
 <iptv>
-	<name>[Gr] 923.gr</name>
+	<name>4E TV {hls}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>www.justin.tv/dramino</uri>
-</iptv>
-
-<iptv>                                                                                                                                
-        <name>[Web] Cinema1</name>
-        <icon>web.png</icon>
-        <type>livestreamer:4097:512</type>
-        <uri>rtmp://46.21.146.45:80/cinema/cinema.sdp pageUrl=http://www.kanalia.eu live=1</uri>
+	<type>livestreamer:4097:512:0</type>
+	<uri>http://mail.tv4e.gr:1935/live/myStream.sdp/playlist.m3u8</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Action24</name>
+	<name>Action24 {rtmp}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://srv1.viiideo.gr/videon/action24 live=1</uri>
 </iptv>
 
 <iptv>                          
-        <name>[Gr] Acheloos TV</name>     
+        <name>Acheloos TV</name>     
         <icon>default.png</icon>                                      
-        <type>livestreamer:4097:512</type>
+        <type>livestreamer:4097:512:0</type>
         <uri>rtmp://srv1.viiideo.gr/videon/axeloostv live=1</uri>      
 </iptv>
 <iptv>
-	<name>[Gr] Acheloos Tv</name>
+	<name>Acheloos TV</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>hlsvariant://http://srv1.viiideo.gr:1935/videon/axeloostv/playlist.m3u8</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Alpha</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>rtmp://94.102.58.45:80/kanali10/kanali10.sdp pageUrl=http://kanalia.eu/alpha_original.php</uri>
-</iptv>
-
-<iptv>
-	<name>[Gr] Alpha</name>
+	<name>Art (Tileasty)</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>hlsvariant://http://alfakanali-lh.akamaihd.net/i/live_1@90368/master.m3u8</uri>
+	<type>livestreamer:4097:512:0</type>
+	<uri>ustream.tv/channel/live-%CE%91%CF%81%CF%84</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Art (Tileasty)</name>
+	<name>Astra Television</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>ustream.tv/channel/teleasty</uri>
-</iptv>
-
-<iptv>
-	<name>[Gr] Astra Television</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>http://www.livestream.com/astratelevision</uri>
 </iptv>
 
 <iptv>                          
-        <name>[Gr] Crete Tv</name>        
-        <icon>default.png</icon>        
-        <type>livestreamer:4097:512</type>
-        <uri>ustream.tv/channel/crete-tv</uri>
+        <name>Crete TV {rtsp}</name>
+        <icon>default.png</icon>
+        <type>http:4097:512:0</type>
+        <uri>rtsp://live.cretetv.gr:1935/cretetv/mp4:myStream</uri>
 </iptv>
-
 <iptv>
-	<name>[Gr] Corfu Tv</name>
+	<name>Crete TV {rtmp}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>ustream.tv/channel/corfu-tv</uri>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://live.cretetv.gr/cretetv/myStream live=1 timeout=1</uri>
 </iptv>
-
 <iptv>
-	<name>[Gr] Channel 9</name>
+	<name>Crete TV {hls}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>http://www.livestream.com/channel9gr</uri>
+	<type>livestreamer:4097:512:0</type>
+	<uri>hlsvariant://http://live.cretetv.gr:1935/cretetv/myStream/playlist.m3u8</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] DH.RA.S</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>rtmp://www.cityofkos.gr/diras/livetv</uri>
+<name>Corfu TV</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>ustream.tv/channel/corfu-tv</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Dion TV</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>ustream.tv/channel/dion-tv-live</uri>
+<name>Channel 9</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>http://www.livestream.com/channel9gr</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Diktio Tv</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>http://www.justin.tv/diktyotv</uri>
+<name>DH.RA.S</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>rtmp://www.cityofkos.gr/diras/livetv</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Egnantia Tv</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>ustream.tv/channel/egnatiatv</uri>
+<name>Dion TV</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>ustream.tv/channel/dion-tv-live</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Epirus TV</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>http://www.livestream.com/epirustv1live</uri>
-</iptv>
-<iptv>
-	<name>[Gr] Extra Channel 3</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>rtmp://213.16.167.186:1935/live playpath=mpegts_256.stream swfUrl=http://extratv.gr/media/imgs/flowplayer-3.2.15.swf live=1</uri>
+<name>Diktio TV</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>http://www.justin.tv/diktyotv</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Ellada Tv</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>rtmp://fml.68FC.edgecastcdn.net/2068FC/elladatv</uri>
+<name>Egnantia TV</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>ustream.tv/channel/egnatiatv</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Ena Tv (Lamia)</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>rtmp://srv1.viiideo.gr/videon/enatv</uri>
+<name>Epirus TV</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>http://www.livestream.com/epirustv1live</uri>
 </iptv>
-
 <iptv>
-	<name>[Gr] Ena Ch. (Kavala)</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>http://www.freedocast.com/charalampi</uri>
+<name>Extra Channel 3</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>rtmp://213.16.167.186:1935/live playpath=mpegts_256.stream swfUrl=http://extratv.gr/media/imgs/flowplayer-3.2.15.swf live=1</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Europe1 Tv</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>ustream.tv/channel/%CE%95%CE%A5%CE%A1%CE%9F%CE%A0%CE%97-1</uri>
+<name>Ellada TV</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>rtmp://fml.68FC.edgecastcdn.net/2068FC/elladatv</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Flash Tv</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>http://www.justin.tv/flash_television</uri>
+<name>Ena Tv (Lamia)</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>rtmp://srv1.viiideo.gr/videon/enatv</uri>
 </iptv>
 
 <iptv>
-	<name>[Web] Greek Video Hits</name>
-	<icon>web.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>http://www.justin.tv/greekvideohits</uri>
+<name>Europe1 Tv</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>ustream.tv/channel/%CE%95%CE%A5%CE%A1%CE%9F%CE%A0%CE%97-1</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Kontra TV</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>rtmp://flashcloud.mediacdn.com/live/kontratv live=1</uri>
+<name>Flash Tv</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>http://www.justin.tv/flash_television</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] LePanto TV</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>rtmp://159.253.143.17:1935/lepanto/lepanto-rtv live=1</uri>
+<name>[Web] Greek Video Hits</name>
+<icon>web.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>http://www.justin.tv/greekvideohits</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Mega Tv</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>rtmp://94.102.58.45:80/megaweb/megaweb.sdp pageUrl=http://kanalia.eu/mega_channel_original.php</uri>
+<name>Kontra TV</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>rtmp://flashcloud.mediacdn.com/live/kontratv live=1</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Mega Tv</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>rtmp://46.21.146.45:80/megaweb/megaweb.sdp pageUrl=http://kanalia.eu/mega_channel_original.php</uri>
+<name>LePanto TV</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>rtmp://159.253.143.17:1935/lepanto/lepanto-rtv live=1</uri>
 </iptv>
 
 <iptv> 
-
-        <name>[Cy] Mega Tv</name>
-        <icon>default.png</icon>
-        <type>livestreamer:4097:512</type>
-         <uri>hlsvariant://http://stream.livenews.com.cy/livenews.isml/Manifest%28format=m3u8-aapl%29.m3u</uri>
+<name>Mega Tv (Cyprus) {hls}</name>
+<icon>default.png</icon>
+<type>livestreamer:4097:512:0</type>
+<uri>hlsvariant://http://stream.livenews.com.cy/livenews.isml/Manifest%28format=m3u8-aapl%29.m3u</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Nea Tv (Crete)</name>
+	<name>Nea Tv (Crete)</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://srv1.viiideo.gr/hellasonmedia/neatv.mp4 live=1</uri>
 </iptv>
+
 <iptv>
-	<name>[Gr] Nea Tv (Crete)</name>
+	<name>Nea Tv (Crete)</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>hlsvariant://http://srv1.viiideo.gr:1935/hellasonmedia/mp4:neatv/playlist.m3u8</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] SAMIAKI TV</name>
+	<name>SAMIAKI TV</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://91.121.107.131/samiaki/samiaki</uri>
 </iptv>
 
 <iptv>
-        <name>[Gr] Skai</name>
+        <name>Skai</name>
         <icon>default.png</icon>
-        <type>livestreamer:4097:512</type>
+        <type>livestreamer:4097:512:0</type>
         <uri>youtube.com/watch?v=XvKIgSVWeOE</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Star Channel</name>
+	<name>Star Channel</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://94.102.58.45:80/alterweb/alterweb.sdp pageUrl=http://kanalia.eu/star_original.php</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Star Channel</name>
+	<name>Star Channel</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://46.21.146.45:80/alterweb/alterweb.sdp pageUrl=http://kanalia.eu/star_original.php</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Syros TV1</name>
+	<name>Syros TV1</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://159.253.143.17/2290/msg116s</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Sport TV</name>
+	<name>Sport TV</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>http://www.livestream.com/grsporttv</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Tilesport</name>
+	<name>Tilesport</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://tv1.streampulse.eu/tilesport/movie1</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] TV 100</name>
+	<name>TV 100</name>
 	<icon>default.png</icon>
-	<type>rtsp:4097:512</type>
+	<type>rtsp:4097:512:0</type>
 	<uri>rtsp://eco.caststream.net/tv100/tv100</uri>
 </iptv>
-
 <iptv>
-	<name>[Gr] Tv Creta</name>
+	<name>TV 100 {rtmp}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>rtmp://srv1.viiideo.gr/hellasonmedia/tvcreta</uri>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://eco.caststream.net/tv100/tv100 live=1 timeout=10</uri>
 </iptv>
+
 <iptv>
-	<name>[Gr] Tv Creta</name>
+	<name>TV Creta {rtmp}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>hlsvariant://http://srv1.viiideo.gr:1935/hellasonmedia/mp4:tvcreta/playlist.m3u8</uri>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://srv1.viiideo.gr/hellasonmedia/tvcreta</uri>
 </iptv>
-
 <iptv>
-	<name>[Gr] Opt tv</name>
+	<name>TV Creta {hls}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>rtmp://video1-uk.datahost.gr/live/patrisnews</uri>
+	<type>livestreamer:4097:512:0</type>
+	<uri>hlsvariant://http://srv1.viiideo.gr:1935/hellasonmedia/mp4:tvcreta/playlist.m3u8</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] West Tv Live</name>
+	<name>West Tv Live</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>ustream.tv/channel/west-tv-live</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Star Lamias</name>
+	<name>Star Lamias</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>http://www.dailymotion.com/video/xqjey2</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Ant1</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>rtmp://tmplive.ant1.gr/live app=live swfVfy=http://static.ant1.gr/live.ashx pageUrl=http://www.antenna.gr/webtv/live playpath=ant1tvnilova live=1</uri>
-</iptv>
-
-<iptv>
-	<name>[Gr] Tv12 (Kalymnos)</name>
+	<name>Tv12 (Kalymnos)</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>http://www.livestream.com/tv12dodekanisou</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] TRT (Kentriki Elada)</name>
+	<name>TRT (Kentriki Elada)</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>http://www.justin.tv/trtcontrol</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Kydon</name>
+	<name>Kydon</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>hlsvariant://http://btslive-lh.akamaihd.net/i/live_1@87036/master.m3u8</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] TV Mitilini</name>
+	<name>TV Mitilini</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://cp77174.live.edgefcs.net/live/123456@19937 live=1</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Top Channel</name>
+	<name>Top Channel</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>www.justin.tv/top_channel</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Rodopi Tv</name>
+	<name>Rodopi Tv</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>www.livestream.com/rodopi_tv</uri>
 </iptv>
 
-<!--MOST OF CYPRUS STREAMS -->
-
 <iptv>
-	<name>[Cy] Ant1 Cyprus</name>
+	<name>Ant1 (Cyprus)</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://videos.ant1.com.cy/livepkgr playpath=livestream?adbe-live-event=liveevent swfVfy=http://www.ant1iwo.com/flowplayer.rtmp-3.1.3.swf live=1</uri>
 </iptv>
 
 <iptv>                          
-        <name>[Gr] Mad Tv</name>          
+        <name>Mad Tv</name>          
         <icon>default.png</icon>        
-        <type>livestreamer:4097:512</type>
+        <type>livestreamer:4097:512:0</type>
         <uri>youtube.com/watch?v=xIc0PnpXVIo</uri>                                                                                   
 </iptv>
 
@@ -390,344 +342,427 @@
 <iptv>
 	<name>[Web] BetAnalysis</name>
 	<icon>web.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>http://livestream.com/livesbx</uri>
 </iptv>
 
 <iptv>
 	<name>[Web] Zuganelis</name>
 	<icon>web.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>http://www.justin.tv/zuganelis</uri>
 </iptv>
 
 <iptv>
 	<name>[Web] Kontilies TV</name>
 	<icon>web.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://events.yourmedia.gr:1935/kontiliestv/kontilies_live live=1</uri>
 </iptv>
 
 <iptv> 
-	<name>[Gr] Gr Channel</name>
+	<name>Gr Channel</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>hls://http://zouglahd-f.akamaihd.net/i/zougla_1@56341/index_700_av-b.m3u8</uri>
 </iptv>
 
 <iptv> 
-	<name>[Gr] Gr Channel</name>
+	<name>Gr Channel</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>hds://http://zouglahd-f.akamaihd.net/z/zougla_1@56341/manifest.f4m</uri>
 </iptv>
 
-<!-- WMV STREAMS (NEED NEW DRIVERS) -->
 <iptv>
-	<name>[Gr WMV] Thraki Net</name>
+	<name>Thraki Net {wmv}</name>
 	<icon>default.png</icon>
-	<type>http:4097:512</type>
+	<type>http:4097:512:0</type>
 	<uri>mms://golive.onestreaming.com/thrakinet</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr WMV] Star Dramas</name>
+	<name>Star Dramas {wmv}</name>
 	<icon>default.png</icon>
-	<type>http:4097:512</type>
+	<type>http:4097:512:0</type>
 	<uri>mmsh://radiofeeds1.mediabox.gr/startv</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr WMV] Fos TV</name>
+	<name>Fos TV {wmv}</name>
 	<icon>default.png</icon>
-	<type>http:4097:512</type>
+	<type>http:4097:512:0</type>
 	<uri>mms://46.4.64.247/ch-patra</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr WMV] Lixnos TV</name>
+	<name>Lixnos TV {wmv}</name>
 	<icon>default.png</icon>
-	<type>http:4097:512</type>
+	<type>http:4097:512:0</type>
 	<uri>mms://87.117.228.15/lixnostv</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr WMV] Omega Tv</name>
+	<name>Omega Tv {wmv}</name>
 	<icon>default.png</icon>
-	<type>rtsp:4097:512</type>
+	<type>rtsp:4097:512:0</type>
 	<uri>rtsp://stream.omegatv.net/Live</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr WMV] Achaia News</name>
+	<name>Achaia News {wmv}</name>
 	<icon>default.png</icon>
-	<type>http:4097:512</type>
+	<type>http:4097:512:0</type>
 	<uri>mms://www999.connectit.gr/stream-web</uri>
 </iptv>
 <iptv>
-	<name>[Gr WMV] Achaia News</name>
+	<name>Achaia News {wmv}</name>
 	<icon>default.png</icon>
-	<type>http:4097:512</type>
+	<type>http:4097:512:0</type>
 	<uri>rtsp://gw5.connectit.gr/stream-web</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr WMV] Delta Tv</name>
+	<name>Delta Tv {wmv}</name>
 	<icon>default.png</icon>
-	<type>http:4097:512</type>
+	<type>http:4097:512:0</type>
 	<uri>mms://ams01.egihosting.com/989630</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr WMV] Gold TV</name>
+	<name>Gold TV {wmv}</name>
 	<icon>default.png</icon>
-	<type>http:4097:512</type>
+	<type>http:4097:512:0</type>
 	<uri>mms://tvgold.webcast.mediacdn.com/tvgold</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr WMV] Irida</name>
+	<name>Irida {wmv}</name>
 	<icon>default.png</icon>
-	<type>http:4097:512</type>
+	<type>http:4097:512:0</type>
 	<uri>mms://212.251.44.111:27030</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] HRT</name>
+	<name>HRT</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>ustream.tv/channel/hrt-live0</uri>
 </iptv>
 
 <iptv>
 	<name>[Web] PlusWebTv</name>
 	<icon>web.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>ustream.tv/channel/pluswebtv</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Vouli</name>
+	<name>Vouli</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://streamer0.grnet.gr/parliament/parltv.sdp</uri>
 </iptv>
 
-<iptv>
-        <name>[Gr] Alpha</name>
-        <icon>default.png</icon>
-        <type>livestreamer:4097:512</type>
-        <uri>hds://http://alfakanali-lh.akamaihd.net/z/live_1@90368/manifest.f4m</uri>
-</iptv>
 
 <iptv>
-	<name>[Gr] Kydon</name>
+	<name>Kydon</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>hds://http://btslive-lh.akamaihd.net/z/live_1@87036/manifest.f4m</uri>
 </iptv>
 <iptv>                                  
-        <name>[Gr] Super Tv</name>
+        <name>Super Tv</name>
         <icon>default.png</icon>
-        <type>livestreamer:4097:512</type>
+        <type>livestreamer:4097:512:0</type>
         <uri>ustream.tv/channel/tvsuperstream</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Ioannina Tv</name>
+	<name>Ioannina Tv</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>ustream.tv/channel/ioannina-tv1</uri>
 </iptv>
 
 <iptv>                                                       
-        <name>[Au] Alpha G.A.</name>
+        <name>Alpha G.A. (Australia)</name>
         <icon>default.png</icon>
-        <type>livestreamer:4097:512</type>
+        <type>livestreamer:4097:512:0</type>
         <uri>livestream.com/alphagatv</uri>
 </iptv>
 
 <iptv>
-	<name>[Cy] Rik Sat</name>
+	<name>Rik Sat (Cyprus)</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>hlsvariant://http://iptv1.cytanet.com.cy/hls-live/livepkgr/riksat/liveevent.m3u8</uri>
-</iptv>
-
-<iptv>
-	<name>[Cy] Rik Sat</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
-	<uri>hds://http://iptv1.cytanet.com.cy/hds-live/livepkgr/riksat/liveevent.f4m</uri>
-</iptv>
-
-<iptv>
-	<name>[Cy] Rik Sat</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>http://www.filmon.com/tv/rik</uri>
 </iptv>
 
-<iptv>                          
-	<name>[Gr] Makedonia Tv</name>            
+<iptv>  
+	<name>Makedonia Tv</name>            
 	<icon>default.png</icon>           
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://213.16.167.55/livepkgr/livestream swfVfy=http://static.ant1.gr/maktvlive.ashx pageUrl=http://www.maktv.gr live=1</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Zeys Tv</name>
+	<name>Zeys Tv</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>www.livestream.com/tvzeys</uri>
 </iptv>
 
 <iptv>                     
-        <name>[Gr] SuperB Tv</name>       
+        <name>SuperB Tv</name>       
         <icon>default.png</icon>                             
-        <type>livestreamer:4097:512</type>
+        <type>livestreamer:4097:512:0</type>
         <uri>http://www.dailymotion.com/video/xxyvtx_live_webcam</uri>
 </iptv>
 
-<iptv>                                                                           
-        <name>!ERT Open</name>
-        <icon>default.png</icon>
-        <type>livestreamer:4097:512</type>
-        <uri>rtmp://live.ertopen.com/live/ert live=1</uri>
-</iptv>
-
 <iptv>
 	<name>[Web] Zougla Live</name>
 	<icon>web.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://cp67108.live.edgefcs.net/live/zouglaradio@15863 live=1</uri>
 </iptv>
 
 <iptv>
 	<name>!ERT3 Open</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>http://veetle.com/index.php/channel/view#51b7cee75aed5</uri>
 </iptv>
+<iptv>
+	<name>!ERT3 Open {rtmp}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://live2.ertopen.com/live2/e600 live=1 timeout=10</uri>
+</iptv>
 
 <iptv>                                    
         <name>[Web] ODIE Ippodromies</name>                 
         <icon>web.png</icon>                                                         
-        <type>livestreamer:4097:512</type>
+        <type>livestreamer:4097:512:0</type>
         <uri>ustream.tv/channel/odie-tv-live</uri>           
 </iptv>
 
 <iptv>                          
         <name>[Web] DotTV.GR</name>       
         <icon>web.png</icon>        
-        <type>livestreamer:4097:512</type>
+        <type>livestreamer:4097:512:0</type>
         <uri>rtmp://edge.vidblee.com/dottv/dottv live=1</uri>
 </iptv>
 
 <iptv>                          
-        <name>[Gr] NTV Serres</name>      
+        <name>NTV Serres</name>      
         <icon>default.png</icon>        
-        <type>livestreamer:4097:512</type>
+        <type>livestreamer:4097:512:0</type>
         <uri>justin.tv/ntvserres</uri>     
 </iptv>
 
 <iptv>
-	<name>[Gr] Euronews</name>
+	<name>Euronews</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>gr.euronews.com</uri>
 </iptv>
 
 <iptv>
-        <name>[Gr] Epiloges TV</name>
+        <name>Epiloges TV</name>
         <icon>default.png</icon>
-        <type>livestreamer:4097:512</type>
+        <type>livestreamer:4097:512:0</type>
         <uri>ustream.tv/channel/tv-epiloges</uri>
 </iptv>
 
 <iptv>
 	<name>[Web] Music Tv</name>
 	<icon>web.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>hlsvariant://http://musictvstream.istoikona.net/musictv.isml/manifest(format=m3u8-aapl).m3u8</uri>
 </iptv>
 
 <iptv>
-	<name>[Web WMV] Gr Music Hits</name>
+	<name>[Web] Gr Music Hits {wmv}</name>
 	<icon>web.png</icon>
-	<type>http:4097:512</type>
+	<type>http:4097:512:0</type>
 	<uri>mmsh://wpso.com:200/music</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] Best Tv</name>
+	<name>Best Tv</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>hlsvariant://http://smooth.istoikona.net/besttv.isml/manifest(format=m3u8-aapl).m3u8</uri>
 </iptv>
 
 <iptv>
-        <name>[Cy] Sports Tv</name>
+        <name>Sports Tv (Cyprus)</name>
         <icon>default.png</icon>
-        <type>livestreamer:4097:512</type>
+        <type>livestreamer:4097:512:0</type>
         <uri>hlsvariant://http://livenews3.istoikona.net/cysports.isml/manifest(format=m3u8-aapl).m3u8</uri>
 </iptv>
 
 <iptv>
-        <name>[Cy] Sigma Tv</name>
+        <name>Sigma Tv (Cyprus)</name>
         <icon>default.png</icon>
-        <type>livestreamer:4097:512</type>
-        <uri>rtmpe://46.19.139.46:443/liveedge1/sigma1678 pageUrl=http://hidecast.com swfUrl=http://hidecast.com/jwplayer/jwplayer.flash.swf</uri>
+        <type>livestreamer:4097:512:0</type>
+        <uri>rtmpe://89.248.170.198:443/liveedge1/sigma1678 pageUrl=http://srvadsense.com live=1 timeout=10</uri>
 </iptv>
 
 <iptv>
-        <name>[Cy] Capital Tv</name>
+        <name>Capital Tv (Cyprus)</name>
         <icon>default.png</icon>
-        <type>livestreamer:4097:512</type>
-        <uri>rtmpe://46.19.139.46:443/liveedge1/capitalcy447 pageUrl=http://hidecast.com swfUrl=http://hidecast.com/jwplayer/jwplayer.flash.swf</uri>
+        <type>livestreamer:4097:512:0</type>
+        <uri>rtmpe://89.248.170.198:443/liveedge1/capitalcy447 pageUrl=http://srvadsense.com live=1 timeout=10</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr WMV] Bluesky</name>
+	<name>Bluesky {wmv}</name>
 	<icon>default.png</icon>
-	<type>http:4097:512</type>
+	<type>http:4097:512:0</type>
 	<uri>mmsh://78.47.26.149:8081/bluesky</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] E Channel</name>
+	<name>E Channel</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://213.16.167.187:1935/live/mpegts_256.stream live=1 timeout=10</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr] E Channel</name>
+	<name>E Channel</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512</type>
+	<type>livestreamer:4097:512:0</type>
 	<uri>rtmp://94.102.58.45:80/kanali10/kanali10.sdp pageUrl=http://kanalia.eu/alpha_original.php live=1 timeout=10</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr WMV] Makedonia Tv</name>
+	<name>Makedonia Tv {wmv}</name>
 	<icon>default.png</icon>
-	<type>http:4097:512</type>
+	<type>http:4097:512:0</type>
 	<uri>mms://206.222.31.146/et31?sid=00000000-0000-0000-0000-000000000000-00-000000</uri>
 </iptv>
 
 <iptv>
-	<name>[Gr WMV] Vouli</name>
+	<name>Vouli {wmv}</name>
 	<icon>default.png</icon>
-	<type>http:4097:512</type>
+	<type>http:4097:512:0</type>
 	<uri>mms://media19.internet.gr/ParliamentTV-HQ</uri>
 </iptv>
 
 <iptv>
-        <name>[Gr] Skai {hls}</name>
+        <name>Skai {hls}</name>
         <icon>default.png</icon>
-        <type>livestreamer:4097:512</type>
+        <type>livestreamer:4097:512:0</type>
         <uri>hlsvariant://http://skaihdn2-f.akamaihd.net/i/geo_2@86985/master.m3u8</uri>
 </iptv>
 
+<iptv>
+	<name>DT</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://cp115017.live.edgefcs.net/live/jiplive@46638 live=1 timeout=10</uri>
+</iptv>
+
+<iptv>
+	<name>Cosmos TV</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://159.253.143.17:1935/webcams/cosmostv live=1 timeout=10</uri>
+</iptv>
+
+<iptv>
+	<name>Ionian Channel</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>http://ustream.tv/channel/ionian-channel</uri>
+</iptv>
+
+<iptv>
+	<name>Mega TV {hls}</name>
+	<icon>default.png</icon>
+	<type>http:4097:512:0</type>
+	<uri>http://megahdlive1-f.akamaihd.net/i/live_1@105260/master.m3u8</uri>
+</iptv>
+
+<iptv>
+	<name>DT {rtmp}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://hprt.flashcloud.mediacdn.com/hprt/live live=1 timeout=10</uri>
+</iptv>
+
+<iptv>
+	<name>DT {hls}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>hlsvariant://http://webcast.flashcloud.mediacdn.com/hprt/live/playlist.m3u8</uri>
+</iptv>
+
+<iptv>
+	<name>ANT1 {hls}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>hlsvariant://http://wow.ant1.gr:1935/live/smil:valonitv1ant.smil/playlist.m3u8</uri>
+</iptv>
+
+<iptv>
+	<name>ANT1 {rtmp}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://tmplive.ant1.gr/live app=live swfUrl=http://static.ant1.gr/live.ashx pageUrl=http://www.antenna.gr/webtv/live playpath=valonitv1ant swfhash=96b7a9b413fbf26da0ed3a84e22c3b2a0bbb80d5f6e2a6dd02b578f7faad57f4 swfsize=312201 live=1 timeout=10</uri>
+</iptv>
+
+<iptv>
+	<name>OPT TV {rtmp}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://media.patrisnews.com/patris/tvstream live=1 timeout=10</uri>
+</iptv>
+
+<iptv>
+	<name>Mega TV {rtmp}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://46.21.146.45:80/megaweb/megaweb.sdp pageUrl=http://kanalia.eu/mega_channel_original.php</uri>
+</iptv>
+
+<iptv>
+	<name>Alpha {hls}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>hlsvariant://http://alfakanali-lh.akamaihd.net/i/live_1@90368/master.m3u8</uri>
+</iptv>
+
+<iptv>
+        <name>Alpha {hds}</name>
+        <icon>default.png</icon>
+        <type>livestreamer:4097:512:0</type>
+        <uri>hds://http://alfakanali-lh.akamaihd.net/z/live_1@90368/manifest.f4m</uri>
+</iptv>
+
+<iptv>
+	<name>Ant1 Cyprus {hls}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>hls://http://videos.ant1.com.cy/hls-live/livepkgr/_definst_/liveevent/livestream.m3u8</uri>
+</iptv>
+
+<iptv>
+	<name>Start TV (Cyprus)</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>http://veetle.com/index.php/channel/view#5149a191525c6</uri>
+</iptv>
+
+<iptv>
+	<name>Ena Channel (Kavala) {rtmp}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://fml.68FC.edgecastcdn.net/2068FC/ena-rtmp live=1 timeout=10</uri>
+</iptv>
+
 </stream>
 

From 26136bd5318e1585bb6f84da968d050a33e12e90 Mon Sep 17 00:00:00 2001
From: Athanasios Oikonomou <athoik@gmail.com>
Date: Fri, 31 Jan 2014 21:47:17 +0200
Subject: [PATCH 2/2] update stream.xml

---
 plugin/stream.xml | 595 ++++++++++++++++++++++++----------------------
 1 file changed, 317 insertions(+), 278 deletions(-)

diff --git a/plugin/stream.xml b/plugin/stream.xml
index f700595..6b9442f 100644
--- a/plugin/stream.xml
+++ b/plugin/stream.xml
@@ -1,257 +1,455 @@
 <?xml version="1.0"?>
 <stream>
+<!-- Mega id 1000 -->	
+<iptv>
+	<name>Mega TV {hls}</name>
+	<icon>default.png</icon>
+	<type>http:4097:512:1000</type>
+	<uri>http://megahdlive1-f.akamaihd.net/i/live_1@105260/master.m3u8</uri>
+</iptv>	
+	
+<iptv>
+	<name>Mega TV {rtmp}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1000</type>
+	<uri>rtmp://46.21.146.45:80/megaweb/megaweb.sdp pageUrl=http://kanalia.eu/mega_channel_original.php</uri>
+</iptv>	
+	
+<!-- ANT1 id 1001 -->	
+<iptv>
+	<name>ANT1 {hls}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1001</type>
+	<uri>hlsvariant://http://wow.ant1.gr:1935/live/smil:valonitv1ant.smil/playlist.m3u8</uri>
+</iptv>
 
 <iptv>
-	<name>4E TV {rtmp}</name>
+	<name>ANT1 {rtmp}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://82.192.84.30:1935/live/myStream.sdp</uri>
+	<type>livestreamer:4097:512:1001</type>
+	<uri>rtmp://tmplive.ant1.gr/live app=live swfUrl=http://static.ant1.gr/live.ashx pageUrl=http://www.antenna.gr/webtv/live playpath=valonitv1ant swfhash=96b7a9b413fbf26da0ed3a84e22c3b2a0bbb80d5f6e2a6dd02b578f7faad57f4 swfsize=312201 live=1 timeout=10</uri>
 </iptv>
+	
+<!-- STAR id 1002 -->	
 <iptv>
-	<name>4E TV {hls}</name>
+	<name>Star Channel</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>http://mail.tv4e.gr:1935/live/myStream.sdp/playlist.m3u8</uri>
+	<type>livestreamer:4097:512:1002</type>
+	<uri>rtmp://94.102.58.45:80/alterweb/alterweb.sdp pageUrl=http://kanalia.eu/star_original.php</uri>
+</iptv>
+
+<iptv>
+	<name>Star Channel</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1002</type>
+	<uri>rtmp://46.21.146.45:80/alterweb/alterweb.sdp pageUrl=http://kanalia.eu/star_original.php</uri>
+</iptv>	
+	
+<!-- ALPHA id 1003 -->
+<iptv>
+	<name>Alpha {hls}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1003</type>
+	<uri>hlsvariant://http://alfakanali-lh.akamaihd.net/i/live_1@90368/master.m3u8</uri>
 </iptv>
 
+<iptv>
+        <name>Alpha {hds}</name>
+        <icon>default.png</icon>
+        <type>livestreamer:4097:512:1003</type>
+        <uri>hds://http://alfakanali-lh.akamaihd.net/z/live_1@90368/manifest.f4m</uri>
+</iptv>
+
+<!-- SKAI id 1004 -->
+<iptv>
+        <name>Skai</name>
+        <icon>default.png</icon>
+        <type>livestreamer:4097:512:1004</type>
+        <uri>youtube.com/watch?v=XvKIgSVWeOE</uri>
+</iptv>
+
+<iptv>
+        <name>Skai {hls}</name>
+        <icon>default.png</icon>
+        <type>livestreamer:4097:512:1004</type>
+        <uri>hlsvariant://http://skaihdn2-f.akamaihd.net/i/geo_2@86985/master.m3u8</uri>
+</iptv>
+
+<!-- ACTION id 1005 -->
 <iptv>
 	<name>Action24 {rtmp}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
+	<type>livestreamer:4097:512:1005</type>
 	<uri>rtmp://srv1.viiideo.gr/videon/action24 live=1</uri>
 </iptv>
 
-<iptv>                          
-        <name>Acheloos TV</name>     
-        <icon>default.png</icon>                                      
-        <type>livestreamer:4097:512:0</type>
-        <uri>rtmp://srv1.viiideo.gr/videon/axeloostv live=1</uri>      
+<!-- VOULI id 1007 -->
+<iptv>
+	<name>Vouli {wmv}</name>
+	<icon>default.png</icon>
+	<type>http:4097:512:1007</type>
+	<uri>mms://media19.internet.gr/ParliamentTV-HQ</uri>
 </iptv>
+
 <iptv>
-	<name>Acheloos TV</name>
+	<name>Vouli</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>hlsvariant://http://srv1.viiideo.gr:1935/videon/axeloostv/playlist.m3u8</uri>
+	<type>livestreamer:4097:512:1007</type>
+	<uri>rtmp://streamer0.grnet.gr/parliament/parltv.sdp</uri>
 </iptv>
 
+<!-- 4E TV id 1008 -->
 <iptv>
-	<name>Art (Tileasty)</name>
+	<name>4E TV {hls}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>ustream.tv/channel/live-%CE%91%CF%81%CF%84</uri>
+	<type>livestreamer:4097:512:1008</type>
+	<uri>http://mail.tv4e.gr:1935/live/myStream.sdp/playlist.m3u8</uri>
 </iptv>
 
 <iptv>
-	<name>Astra Television</name>
+	<name>4E TV {rtmp}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>http://www.livestream.com/astratelevision</uri>
+	<type>livestreamer:4097:512:1008</type>
+	<uri>rtmp://82.192.84.30:1935/live/myStream.sdp</uri>
 </iptv>
 
+<!-- CRETE TV id 1009 -->
 <iptv>                          
         <name>Crete TV {rtsp}</name>
         <icon>default.png</icon>
-        <type>http:4097:512:0</type>
+        <type>http:4097:512:1009</type>
         <uri>rtsp://live.cretetv.gr:1935/cretetv/mp4:myStream</uri>
 </iptv>
 <iptv>
 	<name>Crete TV {rtmp}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
+	<type>livestreamer:4097:512:1009</type>
 	<uri>rtmp://live.cretetv.gr/cretetv/myStream live=1 timeout=1</uri>
 </iptv>
 <iptv>
 	<name>Crete TV {hls}</name>
 	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
+	<type>livestreamer:4097:512:1009</type>
 	<uri>hlsvariant://http://live.cretetv.gr:1935/cretetv/myStream/playlist.m3u8</uri>
+</iptv>	
+	
+<!-- DELTA TV id 1010 -->		
+<iptv>
+	<name>Delta Tv {wmv}</name>
+	<icon>default.png</icon>
+	<type>http:4097:512:1010</type>
+	<uri>mms://ams01.egihosting.com/989630</uri>
+</iptv>	
+	
+<!-- DIKTIO TV id 1011 -->	
+<iptv>
+	<name>Diktio TV</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1011</type>
+	<uri>http://www.justin.tv/diktyotv</uri>
+</iptv>	
+	
+<!-- EPIRUS TV id 1012 -->		
+<iptv>
+	<name>Epirus TV</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1012</type>
+	<uri>http://www.livestream.com/epirustv1live</uri>
+</iptv>	
+	
+<!-- DT TV id 1013 -->	
+<iptv>
+	<name>DT {rtmp}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1013</type>
+	<uri>rtmp://hprt.flashcloud.mediacdn.com/hprt/live live=1 timeout=10</uri>
 </iptv>
 
 <iptv>
-<name>Corfu TV</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>ustream.tv/channel/corfu-tv</uri>
+	<name>DT</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1013</type>
+	<uri>rtmp://cp115017.live.edgefcs.net/live/jiplive@46638 live=1 timeout=10</uri>
 </iptv>
 
 <iptv>
-<name>Channel 9</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>http://www.livestream.com/channel9gr</uri>
+	<name>DT {hls}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1013</type>
+	<uri>hlsvariant://http://webcast.flashcloud.mediacdn.com/hprt/live/playlist.m3u8</uri>
 </iptv>
+	
+<!-- DT TV id 1014 -->		
+<iptv>
+	<name>Kontra TV</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1014</type>
+	<uri>rtmp://flashcloud.mediacdn.com/live/kontratv live=1</uri>
+</iptv>	
+	
 
+<!-- STAR LAMIAS TV id 1015 -->	
 <iptv>
-<name>DH.RA.S</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>rtmp://www.cityofkos.gr/diras/livetv</uri>
+	<name>Star Lamias</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1015</type>
+	<uri>http://www.dailymotion.com/video/xqjey2</uri>
+</iptv>
+
+<!-- MAD TV id 1016 -->	
+<iptv>                          
+        <name>Mad Tv</name>          
+        <icon>default.png</icon>        
+        <type>livestreamer:4097:512:1016/type></type>
+        <uri>youtube.com/watch?v=xIc0PnpXVIo</uri>
+</iptv> 	   
+
+    
+	
+<!-- MAKEDONIA TV id 1017 -->		
+<iptv>  
+	<name>Makedonia Tv</name>            
+	<icon>default.png</icon>           
+	<type>livestreamer:4097:512:1017</type>
+	<uri>rtmp://213.16.167.55/livepkgr/livestream swfVfy=http://static.ant1.gr/maktvlive.ashx pageUrl=http://www.maktv.gr live=1</uri>
 </iptv>
 
 <iptv>
-<name>Dion TV</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>ustream.tv/channel/dion-tv-live</uri>
+	<name>Makedonia Tv {wmv}</name>
+	<icon>default.png</icon>
+	<type>http:4097:512:1017</type>
+	<uri>mms://206.222.31.146/et31?sid=00000000-0000-0000-0000-000000000000-00-000000</uri>
+</iptv>
+	
+<!-- TV 100 id 1018 -->
+<iptv>
+	<name>TV 100</name>
+	<icon>default.png</icon>
+	<type>rtsp:4097:512:1018</type>
+	<uri>rtsp://eco.caststream.net/tv100/tv100</uri>
 </iptv>
+<iptv>
+	<name>TV 100 {rtmp}</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1018</type>
+	<uri>rtmp://eco.caststream.net/tv100/tv100 live=1 timeout=10</uri>
+</iptv>	
 
+<!-- ZOOM TV id 1019 -->	
+
+<!-- EURONEWS TV id 1020 -->	
+<iptv>
+	<name>Euronews</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1020</type>
+	<uri>gr.euronews.com</uri>
+</iptv>	
+	
+<!-- ART TV id 1021 -->
 <iptv>
-<name>Diktio TV</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>http://www.justin.tv/diktyotv</uri>
+	<name>Art (Tileasty)</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1021</type>
+	<uri>ustream.tv/channel/live-%CE%91%CF%81%CF%84</uri>
 </iptv>
+	
+<!-- CHANNEL 9 TV id 1022 -->	
+<iptv>
+	<name>Channel 9</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1022</type>
+	<uri>http://www.livestream.com/channel9gr</uri>
+</iptv>	
+	
+<!-- AIGAIO TV id 1023 -->
+
+<!-- BEST TV id 1024 -->
+<iptv>
+	<name>Best Tv</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1024</type>
+	<uri>hlsvariant://http://smooth.istoikona.net/besttv.isml/manifest(format=m3u8-aapl).m3u8</uri>
+</iptv>	
+	
+<!-- CORFU TV id 1025 -->	
+<iptv>
+	<name>Corfu TV</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1025</type>
+	<uri>ustream.tv/channel/corfu-tv</uri>
+</iptv>	
+	
 
+<!-- RIK SAT TV id 1026 -->
 <iptv>
-<name>Egnantia TV</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>ustream.tv/channel/egnatiatv</uri>
+	<name>Rik Sat (Cyprus)</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1026</type>
+	<uri>http://www.filmon.com/tv/rik</uri>
 </iptv>
 
+<!-- E CHANNEL TV id 1027 -->
 <iptv>
-<name>Epirus TV</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>http://www.livestream.com/epirustv1live</uri>
+	<name>E Channel</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1027</type>
+	<uri>rtmp://213.16.167.187:1935/live/mpegts_256.stream live=1 timeout=10</uri>
 </iptv>
+
 <iptv>
-<name>Extra Channel 3</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>rtmp://213.16.167.186:1935/live playpath=mpegts_256.stream swfUrl=http://extratv.gr/media/imgs/flowplayer-3.2.15.swf live=1</uri>
+	<name>E Channel</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:1027</type>
+	<uri>rtmp://94.102.58.45:80/kanali10/kanali10.sdp pageUrl=http://kanalia.eu/alpha_original.php live=1 timeout=10</uri>
 </iptv>
 
+<!-- Fin EPG -->	
+	
 <iptv>
-<name>Ellada TV</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>rtmp://fml.68FC.edgecastcdn.net/2068FC/elladatv</uri>
+	<name>Omega Tv {wmv}</name>
+	<icon>default.png</icon>
+	<type>rtsp:4097:512:0</type>
+	<uri>rtsp://stream.omegatv.net/Live</uri>
+</iptv>	
+	
+<iptv>                          
+        <name>Acheloos TV</name>     
+        <icon>default.png</icon>                                      
+        <type>livestreamer:4097:512:0</type>
+        <uri>rtmp://srv1.viiideo.gr/videon/axeloostv live=1</uri>      
 </iptv>
 
 <iptv>
-<name>Ena Tv (Lamia)</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>rtmp://srv1.viiideo.gr/videon/enatv</uri>
+	<name>Acheloos TV</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>hlsvariant://http://srv1.viiideo.gr:1935/videon/axeloostv/playlist.m3u8</uri>
 </iptv>
 
 <iptv>
-<name>Europe1 Tv</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>ustream.tv/channel/%CE%95%CE%A5%CE%A1%CE%9F%CE%A0%CE%97-1</uri>
+	<name>Astra Television</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>http://www.livestream.com/astratelevision</uri>
 </iptv>
 
 <iptv>
-<name>Flash Tv</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>http://www.justin.tv/flash_television</uri>
+	<name>DH.RA.S</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://www.cityofkos.gr/diras/livetv</uri>
 </iptv>
 
 <iptv>
-<name>[Web] Greek Video Hits</name>
-<icon>web.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>http://www.justin.tv/greekvideohits</uri>
+	<name>Dion TV</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>ustream.tv/channel/dion-tv-live</uri>
 </iptv>
 
 <iptv>
-<name>Kontra TV</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>rtmp://flashcloud.mediacdn.com/live/kontratv live=1</uri>
+	<name>Egnantia TV</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>ustream.tv/channel/egnatiatv</uri>
 </iptv>
 
 <iptv>
-<name>LePanto TV</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>rtmp://159.253.143.17:1935/lepanto/lepanto-rtv live=1</uri>
+	<name>Extra Channel 3</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://213.16.167.186:1935/live playpath=mpegts_256.stream swfUrl=http://extratv.gr/media/imgs/flowplayer-3.2.15.swf live=1</uri>
 </iptv>
 
-<iptv> 
-<name>Mega Tv (Cyprus) {hls}</name>
-<icon>default.png</icon>
-<type>livestreamer:4097:512:0</type>
-<uri>hlsvariant://http://stream.livenews.com.cy/livenews.isml/Manifest%28format=m3u8-aapl%29.m3u</uri>
+<iptv>
+	<name>Ellada TV</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://fml.68FC.edgecastcdn.net/2068FC/elladatv</uri>
 </iptv>
 
 <iptv>
-	<name>Nea Tv (Crete)</name>
+	<name>Ena Tv (Lamia)</name>
 	<icon>default.png</icon>
 	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://srv1.viiideo.gr/hellasonmedia/neatv.mp4 live=1</uri>
+	<uri>rtmp://srv1.viiideo.gr/videon/enatv</uri>
 </iptv>
 
 <iptv>
-	<name>Nea Tv (Crete)</name>
+	<name>Europe1 Tv</name>
 	<icon>default.png</icon>
 	<type>livestreamer:4097:512:0</type>
-	<uri>hlsvariant://http://srv1.viiideo.gr:1935/hellasonmedia/mp4:neatv/playlist.m3u8</uri>
+	<uri>ustream.tv/channel/%CE%95%CE%A5%CE%A1%CE%9F%CE%A0%CE%97-1</uri>
 </iptv>
 
 <iptv>
-	<name>SAMIAKI TV</name>
+	<name>Flash Tv</name>
 	<icon>default.png</icon>
 	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://91.121.107.131/samiaki/samiaki</uri>
+	<uri>http://www.justin.tv/flash_television</uri>
 </iptv>
 
 <iptv>
-        <name>Skai</name>
-        <icon>default.png</icon>
-        <type>livestreamer:4097:512:0</type>
-        <uri>youtube.com/watch?v=XvKIgSVWeOE</uri>
+	<name>[Web] Greek Video Hits</name>
+	<icon>web.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>http://www.justin.tv/greekvideohits</uri>
 </iptv>
 
 <iptv>
-	<name>Star Channel</name>
+	<name>LePanto TV</name>
 	<icon>default.png</icon>
 	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://94.102.58.45:80/alterweb/alterweb.sdp pageUrl=http://kanalia.eu/star_original.php</uri>
+	<uri>rtmp://159.253.143.17:1935/lepanto/lepanto-rtv live=1</uri>
 </iptv>
 
 <iptv>
-	<name>Star Channel</name>
+	<name>Mega Tv (Cyprus) {hls}</name>
 	<icon>default.png</icon>
 	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://46.21.146.45:80/alterweb/alterweb.sdp pageUrl=http://kanalia.eu/star_original.php</uri>
+	<uri>hlsvariant://http://stream.livenews.com.cy/livenews.isml/Manifest%28format=m3u8-aapl%29.m3u</uri>
 </iptv>
 
 <iptv>
-	<name>Syros TV1</name>
+	<name>Nea Tv (Crete)</name>
 	<icon>default.png</icon>
 	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://159.253.143.17/2290/msg116s</uri>
+	<uri>rtmp://srv1.viiideo.gr/hellasonmedia/neatv.mp4 live=1</uri>
 </iptv>
 
 <iptv>
-	<name>Sport TV</name>
+	<name>Nea Tv (Crete)</name>
 	<icon>default.png</icon>
 	<type>livestreamer:4097:512:0</type>
-	<uri>http://www.livestream.com/grsporttv</uri>
+	<uri>hlsvariant://http://srv1.viiideo.gr:1935/hellasonmedia/mp4:neatv/playlist.m3u8</uri>
 </iptv>
 
 <iptv>
-	<name>Tilesport</name>
+	<name>SAMIAKI TV</name>
 	<icon>default.png</icon>
 	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://tv1.streampulse.eu/tilesport/movie1</uri>
+	<uri>rtmp://91.121.107.131/samiaki/samiaki</uri>
 </iptv>
 
 <iptv>
-	<name>TV 100</name>
+	<name>Syros TV1</name>
 	<icon>default.png</icon>
-	<type>rtsp:4097:512:0</type>
-	<uri>rtsp://eco.caststream.net/tv100/tv100</uri>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://159.253.143.17/2290/msg116s</uri>
 </iptv>
+
 <iptv>
-	<name>TV 100 {rtmp}</name>
+	<name>Sport TV</name>
 	<icon>default.png</icon>
 	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://eco.caststream.net/tv100/tv100 live=1 timeout=10</uri>
+	<uri>http://www.livestream.com/grsporttv</uri>
+</iptv>
+
+<iptv>
+	<name>Tilesport</name>
+	<icon>default.png</icon>
+	<type>livestreamer:4097:512:0</type>
+	<uri>rtmp://tv1.streampulse.eu/tilesport/movie1</uri>
 </iptv>
 
 <iptv>
@@ -274,13 +472,6 @@
 	<uri>ustream.tv/channel/west-tv-live</uri>
 </iptv>
 
-<iptv>
-	<name>Star Lamias</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>http://www.dailymotion.com/video/xqjey2</uri>
-</iptv>
-
 <iptv>
 	<name>Tv12 (Kalymnos)</name>
 	<icon>default.png</icon>
@@ -330,15 +521,7 @@
 	<uri>rtmp://videos.ant1.com.cy/livepkgr playpath=livestream?adbe-live-event=liveevent swfVfy=http://www.ant1iwo.com/flowplayer.rtmp-3.1.3.swf live=1</uri>
 </iptv>
 
-<iptv>                          
-        <name>Mad Tv</name>          
-        <icon>default.png</icon>        
-        <type>livestreamer:4097:512:0</type>
-        <uri>youtube.com/watch?v=xIc0PnpXVIo</uri>                                                                                   
-</iptv>
-
 <!-- WEB -->
-
 <iptv>
 	<name>[Web] BetAnalysis</name>
 	<icon>web.png</icon>
@@ -402,12 +585,7 @@
 	<uri>mms://87.117.228.15/lixnostv</uri>
 </iptv>
 
-<iptv>
-	<name>Omega Tv {wmv}</name>
-	<icon>default.png</icon>
-	<type>rtsp:4097:512:0</type>
-	<uri>rtsp://stream.omegatv.net/Live</uri>
-</iptv>
+
 
 <iptv>
 	<name>Achaia News {wmv}</name>
@@ -422,12 +600,7 @@
 	<uri>rtsp://gw5.connectit.gr/stream-web</uri>
 </iptv>
 
-<iptv>
-	<name>Delta Tv {wmv}</name>
-	<icon>default.png</icon>
-	<type>http:4097:512:0</type>
-	<uri>mms://ams01.egihosting.com/989630</uri>
-</iptv>
+
 
 <iptv>
 	<name>Gold TV {wmv}</name>
@@ -457,14 +630,6 @@
 	<uri>ustream.tv/channel/pluswebtv</uri>
 </iptv>
 
-<iptv>
-	<name>Vouli</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://streamer0.grnet.gr/parliament/parltv.sdp</uri>
-</iptv>
-
-
 <iptv>
 	<name>Kydon</name>
 	<icon>default.png</icon>
@@ -485,27 +650,6 @@
 	<uri>ustream.tv/channel/ioannina-tv1</uri>
 </iptv>
 
-<iptv>                                                       
-        <name>Alpha G.A. (Australia)</name>
-        <icon>default.png</icon>
-        <type>livestreamer:4097:512:0</type>
-        <uri>livestream.com/alphagatv</uri>
-</iptv>
-
-<iptv>
-	<name>Rik Sat (Cyprus)</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>http://www.filmon.com/tv/rik</uri>
-</iptv>
-
-<iptv>  
-	<name>Makedonia Tv</name>            
-	<icon>default.png</icon>           
-	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://213.16.167.55/livepkgr/livestream swfVfy=http://static.ant1.gr/maktvlive.ashx pageUrl=http://www.maktv.gr live=1</uri>
-</iptv>
-
 <iptv>
 	<name>Zeys Tv</name>
 	<icon>default.png</icon>
@@ -561,13 +705,6 @@
         <uri>justin.tv/ntvserres</uri>     
 </iptv>
 
-<iptv>
-	<name>Euronews</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>gr.euronews.com</uri>
-</iptv>
-
 <iptv>
         <name>Epiloges TV</name>
         <icon>default.png</icon>
@@ -589,13 +726,6 @@
 	<uri>mmsh://wpso.com:200/music</uri>
 </iptv>
 
-<iptv>
-	<name>Best Tv</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>hlsvariant://http://smooth.istoikona.net/besttv.isml/manifest(format=m3u8-aapl).m3u8</uri>
-</iptv>
-
 <iptv>
         <name>Sports Tv (Cyprus)</name>
         <icon>default.png</icon>
@@ -624,48 +754,6 @@
 	<uri>mmsh://78.47.26.149:8081/bluesky</uri>
 </iptv>
 
-<iptv>
-	<name>E Channel</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://213.16.167.187:1935/live/mpegts_256.stream live=1 timeout=10</uri>
-</iptv>
-
-<iptv>
-	<name>E Channel</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://94.102.58.45:80/kanali10/kanali10.sdp pageUrl=http://kanalia.eu/alpha_original.php live=1 timeout=10</uri>
-</iptv>
-
-<iptv>
-	<name>Makedonia Tv {wmv}</name>
-	<icon>default.png</icon>
-	<type>http:4097:512:0</type>
-	<uri>mms://206.222.31.146/et31?sid=00000000-0000-0000-0000-000000000000-00-000000</uri>
-</iptv>
-
-<iptv>
-	<name>Vouli {wmv}</name>
-	<icon>default.png</icon>
-	<type>http:4097:512:0</type>
-	<uri>mms://media19.internet.gr/ParliamentTV-HQ</uri>
-</iptv>
-
-<iptv>
-        <name>Skai {hls}</name>
-        <icon>default.png</icon>
-        <type>livestreamer:4097:512:0</type>
-        <uri>hlsvariant://http://skaihdn2-f.akamaihd.net/i/geo_2@86985/master.m3u8</uri>
-</iptv>
-
-<iptv>
-	<name>DT</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://cp115017.live.edgefcs.net/live/jiplive@46638 live=1 timeout=10</uri>
-</iptv>
-
 <iptv>
 	<name>Cosmos TV</name>
 	<icon>default.png</icon>
@@ -680,41 +768,6 @@
 	<uri>http://ustream.tv/channel/ionian-channel</uri>
 </iptv>
 
-<iptv>
-	<name>Mega TV {hls}</name>
-	<icon>default.png</icon>
-	<type>http:4097:512:0</type>
-	<uri>http://megahdlive1-f.akamaihd.net/i/live_1@105260/master.m3u8</uri>
-</iptv>
-
-<iptv>
-	<name>DT {rtmp}</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://hprt.flashcloud.mediacdn.com/hprt/live live=1 timeout=10</uri>
-</iptv>
-
-<iptv>
-	<name>DT {hls}</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>hlsvariant://http://webcast.flashcloud.mediacdn.com/hprt/live/playlist.m3u8</uri>
-</iptv>
-
-<iptv>
-	<name>ANT1 {hls}</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>hlsvariant://http://wow.ant1.gr:1935/live/smil:valonitv1ant.smil/playlist.m3u8</uri>
-</iptv>
-
-<iptv>
-	<name>ANT1 {rtmp}</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://tmplive.ant1.gr/live app=live swfUrl=http://static.ant1.gr/live.ashx pageUrl=http://www.antenna.gr/webtv/live playpath=valonitv1ant swfhash=96b7a9b413fbf26da0ed3a84e22c3b2a0bbb80d5f6e2a6dd02b578f7faad57f4 swfsize=312201 live=1 timeout=10</uri>
-</iptv>
-
 <iptv>
 	<name>OPT TV {rtmp}</name>
 	<icon>default.png</icon>
@@ -722,25 +775,11 @@
 	<uri>rtmp://media.patrisnews.com/patris/tvstream live=1 timeout=10</uri>
 </iptv>
 
-<iptv>
-	<name>Mega TV {rtmp}</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>rtmp://46.21.146.45:80/megaweb/megaweb.sdp pageUrl=http://kanalia.eu/mega_channel_original.php</uri>
-</iptv>
-
-<iptv>
-	<name>Alpha {hls}</name>
-	<icon>default.png</icon>
-	<type>livestreamer:4097:512:0</type>
-	<uri>hlsvariant://http://alfakanali-lh.akamaihd.net/i/live_1@90368/master.m3u8</uri>
-</iptv>
-
-<iptv>
-        <name>Alpha {hds}</name>
+<iptv>                                                       
+        <name>Alpha G.A. (Australia)</name>
         <icon>default.png</icon>
         <type>livestreamer:4097:512:0</type>
-        <uri>hds://http://alfakanali-lh.akamaihd.net/z/live_1@90368/manifest.f4m</uri>
+        <uri>livestream.com/alphagatv</uri>
 </iptv>
 
 <iptv>