From e7fb019e1d51c9db170c1f06201caefe0b3afc8f Mon Sep 17 00:00:00 2001
From: Koos Vriezen <koos.vriezen@gmail.com>
Date: Wed, 3 Feb 2010 19:08:51 +0100
Subject: [PATCH] More updates from bunanson

---
 data/WorldTV99.xml |  100 ++++++++++++++++++++++++++++------------------------
 1 file changed, 53 insertions(+), 47 deletions(-)

diff --git a/data/WorldTV99.xml b/data/WorldTV99.xml
index 5a372cb..2f3ff22 100644
--- a/data/WorldTV99.xml
+++ b/data/WorldTV99.xml
@@ -119,12 +119,11 @@
       <item title="VH1 The Best of VH1" aspectRatio="15:9" url="http://www.vh1.com/rss/podcast/bestofvh1.jhtml"/>
       <item title="VH1 Today in music" aspectRatio="15:9" url="http://www.vh1.com/rss/today_in_music/index.jhtml"/>
     </group>
-    <item title="WDEVN - All about the living World - from Asia" aspectRatio="15:9" url="http://www.wdevn.com/wdevn.xml"/>
   </group>
   <group title="Brazil">
     <item url="mms://201.12.119.29/tvjangadeiro/" aspectRatio="15:9" title="TV Jangadeiro - SBT"/>
   </group>
-  <group title="*Canada">
+  <group title="Canada">
     <item url="http://stream2.canal.qc.ca/enOndes_haut_debit" aspectRatio="15:9" title="Canal Savoir Scientific talk"/>
     <item url="http://www.cbc.ca/mrl3/8752/newsatsix/calgary.wmv" aspectRatio="15:9" title="CBC Calgary,Local news from Calgary"/>
     <item url="http://www.cbc.ca/mrl3/8752/newsatsix/edmonton.wmv" aspectRatio="15:9" title="CBC Edmonton,Recorded Edmonton evening news"/>
@@ -163,23 +162,24 @@
   <group title="China">
     <item url="mms://72.166.136.132/cctv4-200" aspectRatio="15:9" title="China CCTV4 Beijing"/>
     <item url="http://simplyming.dreamhosters.com/rss/vodcast.xml" aspectRatio="15:9" title="China HK Simply Ming"/>
+    <item url="mms://online.ntdtvcast.com/Stream-Live" aspectRatio="15:9" title="USA China NTD TV NYC"/>
+    <item title="WDEVN-All about living World-Asia,China Taipei" aspectRatio="15:9" url="http://www.wdevn.com/wdevn.xml"/>
   </group>
-  <group title="Denmark">
+  <group title="Denmark LOCAL ONLY">
     <item url="http://www.dr.dk/Forms/Published/PlaylistGen.aspx?qid=786405" aspectRatio="15:9" title="DR1"/>
     <item url="http://www.dr.dk/Forms/Published/PlaylistGen.aspx?qid=786410" aspectRatio="15:9" title="DR2"/>
     <item url="http://www.dr.dk/tjenester/podcast/update.asx?qid=288417" aspectRatio="15:9" title="DR Update"/>
   </group>
-  <item url="http://www.geobrief.tv/podcasts/movies/wmv.xml" aspectRatio="15:9" title="Dutch Amsterdam"/>
   <group title="Finland NOKIA">
     <item url="mms://62.41.56.32/PUBLIC_votv_fi" aspectRatio="15:9" title="The Voice"/>
   </group>
   <group title="France">
-    <item url="mms://vipmms9.yacast.net/bfm_bfmtv" aspectRatio="15:9" title="*France BFM TV"/>
+    <item url="mms://vipmms9.yacast.net/bfm_bfmtv" aspectRatio="15:9" title="France BFM TV"/>
     <item url="mms://www.labelletv.net/labelleTV" aspectRatio="15:9" title="Labelle TV 384 x 288 339 http://labelletv.net"/>
     <item url="mms://88.191.23.167/mboatv" aspectRatio="15:9" title="MBOA TV 360 x 288 346 http://www.mboatv.com/"/>
     <item url="mms://195.95.225.110/telenight" aspectRatio="15:9" title="Telenight.com 468 x 382 531 http://www.telenight.com/"/>
   </group>
-  <group title="*Germany">
+  <group title="Germany">
     <item url="mms://d8019013969.w.glx.core006.cdn.streamfarm.net/11008bmt/live/3338s09tvfranken/300.wmv?cid=60751&amp;dummy=.wmv" aspectRatio="15:9" title="Franken TV (Nurnberg)"/>
     <item url="mms://d8019013969.w.glx.core006.cdn.streamfarm.net/11008bmt/live/3338s15muenchentv/300.wmv?cid=60919&amp;dummy=.wmv" aspectRatio="15:9" title="muenchen.tv"/>
     <item url="mms://213.254.239.66/ndrfernsehen$ndr_hh" title="NDR Fernsehen" panZoom="0,20,240,140"/>
@@ -200,36 +200,8 @@
   </group>
   <item url="mms://live1.szupernet.tv/piros" aspectRatio="15:9" title="Hungary SzuperNet TV Piros 384 x 288 409"/>
   <group title="Italy">
-    <item title="ATV" aspectRatio="15:9" url="http://atv.com.tr/canli_yayin"/>
-    <item title="AVAZ" aspectRatio="15:9" url="mms://212.156.63.226/TRTAVAZ"/>
-    <item title="Belgesel" aspectRatio="15:9" url="mms://212.156.63.226/TRTBELGESEL"/>
-    <item title="Kanal D" aspectRatio="15:9" url="http://webtv.kanald.com.tr/CanliYayin/"/>
     <item url="mms://iptv.telecard.it/3Channel" aspectRatio="15:9" title="Italy 3 Channel"/>
-    <item title="Kanal 7" aspectRatio="15:9" url="http://www.yayin.tv.tr/play.stream.php?id=1"/>
-    <item title="Kanal 7 HQ" aspectRatio="15:9" url="http://www.yayin.tv.tr/play.stream.php?id=20"/>
-    <item title="Kanal 7 International" aspectRatio="15:9" url="http://www.yayin.tv.tr/play.stream.php?id=2"/>
-    <item title="Kral TV" aspectRatio="15:9" url="http://kraltv.com.tr/"/>
-    <item title="Mehtap TV" aspectRatio="15:9" url="http://live0.stv.com.tr/mehtap"/>
-    <item title="Muzik" aspectRatio="15:9" url="mms://212.156.63.102/TRTMUZIK"/>
-    <item title="Numberone TV" aspectRatio="15:9" url="mms://94.76.204.106/numberone"/>
-    <item title="PoerTurk TV" aspectRatio="15:9" url="mms://media1.powergroupturkey.com/Po"/>
-    <item title="Samanyolu America" aspectRatio="15:9" url="http://live0.stv.com.tr/syg"/>
-    <item title="Samanyolu Haber" aspectRatio="15:9" url="http://live0.stv.com.tr/shaber"/>
-    <item title="Samanyolu TV" aspectRatio="15:9" url="http://live0.stv.com.tr/stv"/>
-    <item title="Samanyolu TV Europe" aspectRatio="15:9" url="mms://live.samanyolutv.de/stv_avrupa"/>
-    <item title="Show TV" aspectRatio="15:9" url="http://www.showtv.com.tr/asx/SAlone.asp?product=showtv&pType=1"/>
-    <item title="Show TV Europe" aspectRatio="15:9" url="http://www.showturk.tv/asx/default1.asp?product=showturk"/>
-    <item title="Star TV" aspectRatio="15:9" url="http://startv.com.tr/CanliYayin.aspx"/>
     <item url="mms://wmlive.telemolise.com/multicast_stream2" aspectRatio="15:9" title="telemolise"/>
-    <item title="TV1" aspectRatio="15:9" url="mms://212.156.63.226/TV1"/>
-    <item title="TV2" aspectRatio="15:9" url="mms://212.156.63.226/TV2"/>
-    <item title="TV3" aspectRatio="15:9" url="mms://212.156.63.226/TV3"/>
-    <item title="TV4" aspectRatio="15:9" url="mms://212.156.63.226/TV4"/>
-    <item title="TV5" aspectRatio="15:9" url="mms://212.156.63.226/TV5"/>
-    <item title="TURK" aspectRatio="15:9" url="mms://212.156.63.226/TRTTURK"/>
-    <item title="Ulke TV" aspectRatio="15:9" url="http://www.yayin.tv.tr/play.stream.php?id=3"/>
-    <item title="Ulke TV HQ" aspectRatio="15:9" url="[url]http://www.yayin.tv.tr/play.stream.php?id=21"/>
-    <item title="Yumurcak TV" aspectRatio="15:9" url="http://live0.stv.com.tr/yumurcak"/>
   </group>
   <item url="mms://streaming.newmedia.lu/telehighres" aspectRatio="15:9" title="Luxembourg RTL"/>
   <group title="Mexico">
@@ -244,6 +216,8 @@
     <item url="rtsp://200.52.193.75:554/encoder/videorola.rm?cloakport=6060,554,7070" title="Mexico|Music|450|VideoRola|Music TV" aspectRatio="15:9"/>
   </group>
   <group title="Netherlands">
+    <item url="http://www.geobrief.tv/podcasts/movies/wmv.xml" aspectRatio="15:9" title="Amsterdam"/>
+    <item url="http://cgi.omroep.nl/cgi-bin/streams?/nos/journaal/laatstejournaalSB.wmv" aspectRatio="15:9" title="Laatste NOS Journaal"/>
     <item url="mms://81.173.117.20/mtv_low_005" aspectRatio="15:9" title="MTV Brand New 384 x 288 502"/>
     <item url="mms://81.173.117.20/MTV_Low_008" aspectRatio="15:9" title="Nick Hits 384 x 288 502"/>
     <item url="mms://213.75.12.108/encoder11" aspectRatio="15:9" title="Nostalgie Net"/>
@@ -252,10 +226,9 @@
     <item url="mms://81.173.117.20/MTV_Low_004" aspectRatio="15:9" title="TMF FIRE IT UP 384 x 288 502 http://www.tmf.nl/"/>
     <item url="mms://81.173.117.20/MTV_LOW_006" aspectRatio="15:9" title="TMF HOLLANDS GLORIE 384 x 288 502"/>
     <item url="mms://81.173.117.20/MTV_Low_007" aspectRatio="15:9" title="TMF Pure 384 x 288 502 http://www.tmf.nl/"/>
-    <item url="http://cgi.omroep.nl/cgi-bin/streams?/nos/journaal/laatstejournaalSB.wmv" aspectRatio="15:9" title="Laatste NOS Journaal"/>
     <item url="mms://livemedia2.omroep.nl/vpro3voor12tvcentral-sb" aspectRatio="15:9" title="VPRO"/>
   </group>
-  <group title="Norway">
+  <group title="Norway LOCAL ONLY">
     <item url="mms://straumV.nrk.no/nrk_tv_svisj24_mbr" aspectRatio="15:9" title="Norway NRK Svisj 768 x 432 1000"/>
     <item url="mms://straumv.nrk.no/nrk_tv_direkte_nrk1_m" aspectRatio="15:9" title="NRK1"/>
     <item url="mms://straumv.nrk.no/nrk_tv_direkte_nrk2_m" aspectRatio="15:9" title="NRK2"/>
@@ -274,8 +247,10 @@
     <item url="mms://viseutv.sytes.net:8080/" aspectRatio="15:9" title="Portugal Viseu TV"/>
     <item url="mms://media.stream-music.net/yourvida" aspectRatio="15:9" title="Yourvida"/>
   </group>
-  <item url="mms://www.online-tv.ro/UTV" aspectRatio="15:9" title="Romania U TV 320 x 240 314 http://uonline.ro/"/>
-  <item url="mms://82.76.253.22/Antena1Live:6465" aspectRatio="15:9" title="Romania Antena 1"/>
+  <group title="Romania">
+    <item url="mms://www.online-tv.ro/UTV" aspectRatio="15:9" title="Romania U TV 320 x 240 314 http://uonline.ro/"/>
+    <item url="mms://82.76.253.22/Antena1Live:6465" aspectRatio="15:9" title="Romania Antena 1"/>
+  </group>
   <group title="Russia">
     <item url="mms://live.1internet.tv/fz7-efir" aspectRatio="15:9" title="Russia 1 TV"/>
     <item url="http://mfile.akamai.com/45346/live/reflector:59936.asx" aspectRatio="15:9" title="Russia e-Televizor MAD"/>
@@ -294,24 +269,56 @@
   <item url="mms://wmedia.siol.net/paprika/live" aspectRatio="15:9" title="Slovenia Paprika TV VH1 320 x 240 660 http://www.paprika.tv/"/>
   <item url="mms://81.89.49.210/musicbox" aspectRatio="15:9" title="Slovkia Music Box 384 x 288 306 http://www.mcbox.tv"/>
   <item url="mms://soleiltv.impek.tv/soleiltv" aspectRatio="15:9" title="Soleil TV Mystic, Antille 320 x 240 512 http://www.soleiltv.com"/>
-  <group aspectRatio="15:9" title="Spain">
-    <item url="mms://66.225.235.202/va92winlive2314" aspectRatio="15:9" title="*Spain Kiss TV 384 x 288 222 http://www.kisstelevision.es/"/>
+  <group title="Spain">
+    <item url="mms://66.225.235.202/va92winlive2314" aspectRatio="15:9" title="Spain Kiss TV 384 x 288 222 http://www.kisstelevision.es/"/>
     <item url="mms://wm.ondemand.pa.edgestreams.net/reflector:49850" aspectRatio="15:9" title="Spain RTPA"/>
     <item url="mms://a1014.l1401540961.c14015.e.lm.akamaistream.net/D/1014/14015/v0001/reflector:40961" aspectRatio="15:9" title="Spain CNN"/>
     <item url="mms://213.151.102.115/teletaxitv" aspectRatio="15:9" title="Spain Teletaxi TV 320 x 240 141 http://www.teletaxitv.com/"/>
     <item url="mms://www.tvconciertos.com/tvLive" aspectRatio="15:9" title="Spain TVconciertos 320 x 240 282 http://www.tvconciertos.com/"/>
   </group>
   <item url="mms://220.247.224.106/swarnavahini" aspectRatio="15:9" title="Sri Lanka Swarnavahini 384 x 288 141 http://www.swarnavahini.lk/"/>
-  <item url="mms://213.80.127.1/Canal7_4" aspectRatio="15:9" title="Sweden Canal 7"/>
-  <item url="mms://62.41.56.32/PUBLIC_SWE" aspectRatio="15:9" title="Sweden The Voice 384 x 288 596 http://www.thevoicetv.se/"/>
-  <item url="mms://broadcast.issp.co.th/11news1" aspectRatio="15:9" title="Thailand News1"/>
-  <item url="mms://61.19.248.196/mvtv_3?WMContentBitrate=256000&amp;MSWMExt=.asf" aspectRatio="15:9" title="Thailand MVTV 3, 320 x 240 247"/>
-  <item url="mms://mediaii.mcot.net/tv9" aspectRatio="15:9" title="Thailand TV9"/>
+  <group title="Sweden">
+    <item url="mms://213.80.127.1/Canal7_4" aspectRatio="15:9" title="Sweden Canal 7"/>
+    <item url="mms://62.41.56.32/PUBLIC_SWE" aspectRatio="15:9" title="Sweden The Voice 384 x 288 596 http://www.thevoicetv.se/"/>
+  </group>
+  <group title="Thailand">
+    <item url="mms://broadcast.issp.co.th/11news1" aspectRatio="15:9" title="Thailand News1"/>
+    <item url="mms://61.19.248.196/mvtv_3?WMContentBitrate=256000&amp;MSWMExt=.asf" aspectRatio="15:9" title="Thailand MVTV 3, 320 x 240 247"/>
+    <item url="mms://mediaii.mcot.net/tv9" aspectRatio="15:9" title="Thailand TV9"/>
+  </group>
   <group title="Turkey">
+    <item title="ATV" aspectRatio="15:9" url="http://atv.com.tr/canli_yayin"/>
+    <item title="AVAZ" aspectRatio="15:9" url="mms://212.156.63.226/TRTAVAZ"/>
+    <item title="Belgesel" aspectRatio="15:9" url="mms://212.156.63.226/TRTBELGESEL"/>
+    <item title="Kanal D" aspectRatio="15:9" url="http://webtv.kanald.com.tr/CanliYayin/"/>
+    <item title="Kanal 7" aspectRatio="15:9" url="http://www.yayin.tv.tr/play.stream.php?id=1"/>
+    <item title="Kanal 7 HQ" aspectRatio="15:9" url="http://www.yayin.tv.tr/play.stream.php?id=20"/>
+    <item title="Kanal 7 International" aspectRatio="15:9" url="http://www.yayin.tv.tr/play.stream.php?id=2"/>
+    <item title="Kral TV" aspectRatio="15:9" url="http://kraltv.com.tr/"/>
+    <item title="Mehtap TV" aspectRatio="15:9" url="http://live0.stv.com.tr/mehtap"/>
+    <item title="Muzik" aspectRatio="15:9" url="mms://212.156.63.102/TRTMUZIK"/>
+    <item title="Numberone TV" aspectRatio="15:9" url="mms://94.76.204.106/numberone"/>
+    <item title="PoerTurk TV" aspectRatio="15:9" url="mms://media1.powergroupturkey.com/Po"/>
+    <item title="Samanyolu America" aspectRatio="15:9" url="http://live0.stv.com.tr/syg"/>
+    <item title="Samanyolu Haber" aspectRatio="15:9" url="http://live0.stv.com.tr/shaber"/>
+    <item title="Samanyolu TV" aspectRatio="15:9" url="http://live0.stv.com.tr/stv"/>
+    <item title="Samanyolu TV Europe" aspectRatio="15:9" url="mms://live.samanyolutv.de/stv_avrupa"/>
+    <item title="Show TV" aspectRatio="15:9" url="http://www.showtv.com.tr/asx/SAlone.asp?product=showtv&pType=1"/>
+    <item title="Show TV Europe" aspectRatio="15:9" url="http://www.showturk.tv/asx/default1.asp?product=showturk"/>
+    <item title="Star TV" aspectRatio="15:9" url="http://startv.com.tr/CanliYayin.aspx"/>
     <item url="mms://212.175.166.3/TV1" aspectRatio="15:9" title="Turkey TRT 1 national TV"/>
     <item url="mms://212.175.166.3/TV2" aspectRatio="15:9" title="Turkey TRT 2"/>
     <item url="mms://212.175.166.3/TRT3" aspectRatio="15:9" title="Turkey TRT 3"/>
     <item url="mms://212.175.166.3/TRTINT" aspectRatio="15:9" title="Turkey TRT Int"/>
+    <item title="TV1" aspectRatio="15:9" url="mms://212.156.63.226/TV1"/>
+    <item title="TV2" aspectRatio="15:9" url="mms://212.156.63.226/TV2"/>
+    <item title="TV3" aspectRatio="15:9" url="mms://212.156.63.226/TV3"/>
+    <item title="TV4" aspectRatio="15:9" url="mms://212.156.63.226/TV4"/>
+    <item title="TV5" aspectRatio="15:9" url="mms://212.156.63.226/TV5"/>
+    <item title="TURK" aspectRatio="15:9" url="mms://212.156.63.226/TRTTURK"/>
+    <item title="Ulke TV" aspectRatio="15:9" url="http://www.yayin.tv.tr/play.stream.php?id=3"/>
+    <item title="Ulke TV HQ" aspectRatio="15:9" url="[url]http://www.yayin.tv.tr/play.stream.php?id=21"/>
+    <item title="Yumurcak TV" aspectRatio="15:9" url="http://live0.stv.com.tr/yumurcak"/>
   </group>
   <group title="UK">
     <item url="mms://wm.bbc.net.uk/england/looknorthyorkslincs/nb/looknorth_16x9_nb.wmv" aspectRatio="15:9" title="UK BBC Looknorth"/>
@@ -319,9 +326,8 @@
   <group title="USA">
     <item url="mms://mid.video.csupomona.edu/liveOne-245" aspectRatio="15:9" title="USA ARTS Cal Poly Pomona TV 320 x 240 246"/>
     <item url="mms://a1832.l731147410.c7311.n.lm.akamaistream.net/D/1832/7311/v0001/reflector:47410" aspectRatio="15:9" title="USA CBS 27 Kentucky"/>
-    <item url="mms://online.ntdtvcast.com/Stream-Live" aspectRatio="15:9" title="*USA China NTD TV NYC"/>
     <item url="mms://a195.l2307334194.c23073.g.lm.akamaistream.net/D/195/23073/v0001/reflector:34194" aspectRatio="15:9" title="USA Fox 11 Los Angeles"/>
-    <item url="mms://ir2-c100.narrowstep.tv/mcp?psid=62553022&amp;ref=0&amp;chid=425&amp;pid=2436&amp;vid=44966764&amp;br=400&amp;tid=2&amp;brid=506&amp;fab=0&amp;MSWMExt=.asf" aspectRatio="15:9" title="*USA GlobeTrekkerTV"/>
+    <item url="mms://ir2-c100.narrowstep.tv/mcp?psid=62553022&amp;ref=0&amp;chid=425&amp;pid=2436&amp;vid=44966764&amp;br=400&amp;tid=2&amp;brid=506&amp;fab=0&amp;MSWMExt=.asf" aspectRatio="15:9" title="USA GlobeTrekkerTV"/>
     <item url="mms://a1053.l2277456292.c22774.n.lm.akamaistream.net/D/1053/22774/v0001/reflector:56292" aspectRatio="15:9" title="USA MMNW Broadcasts GMTN 320 x 240 300 http://www.gmtn.info/"/>
     <item url="http://www.mod-tv.com/podcasts/modtv/modtv_podcast.xml" aspectRatio="15:9" title="mod-tv"/>
     <item url="mms://msnbc.wmod.llnwd.net/a275/e1/video/100/vh.asf" aspectRatio="15:9" title="USA NBC MSNBC mobile"/>
-- 
1.7.9.5