summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorM. Voerman <rekordc@gmail.com>2015-02-06 17:05:00 +0100
committerM. Voerman <rekordc@gmail.com>2015-02-06 17:05:00 +0100
commitb996f3095f547c621b5a445e464a836757de69b5 (patch)
tree22870f51433450388dac11d57165311a7c353751
parentd1cd9be6afaa4f147f999ada9e41ff3166386698 (diff)
downloadvdr-vipclient-b996f3095f547c621b5a445e464a836757de69b5.tar.gz
vdr-vipclient-b996f3095f547c621b5a445e464a836757de69b5.tar.bz2
Added weather info, menu <green>
try to get serverip from portalurls in flash
-rw-r--r--History5
-rw-r--r--index.html1
-rw-r--r--javascript/channels.js1648
-rw-r--r--javascript/main.js53
-rw-r--r--javascript/news.js0
-rw-r--r--javascript/settings.js5
-rw-r--r--javascript/weather.js33
-rw-r--r--languages/lang_dut.js1
-rw-r--r--languages/lang_eng.js2
-rw-r--r--languages/lang_ger.js5
10 files changed, 912 insertions, 841 deletions
diff --git a/History b/History
index 8ee7601..46598c6 100644
--- a/History
+++ b/History
@@ -7,6 +7,11 @@ Marc E for the black skin.
VDR 1.7.29+
+0.27 Weather info from openweathermap.org added.
+ Don't start the stream on boot or reload of the script if box is in standby
+ Fixed error getting german languages file.
+ Get server ip from flash
+
0.26 Fix for [undefined] in (search)timer menu when there are no (search)timers on server
Changed Plugin check, only check if digit 1,2,3 from server ip & box ip are the same.
Updated epgfilter for CDS on 19.2E, Brava HDTV on 23.2E
diff --git a/index.html b/index.html
index a4af570..d00bedb 100644
--- a/index.html
+++ b/index.html
@@ -6,6 +6,7 @@
<script type="text/javascript" src="javascript/channels.js"></script>
<script type="text/javascript" src="config/custom.js"></script>
<script type="text/javascript" src="javascript/main.js"></script>
+<script type="text/javascript" src="javascript/weather.js"></script>
<script type="text/javascript">
/***********************************************************/
diff --git a/javascript/channels.js b/javascript/channels.js
index 3fcb096..56c9d09 100644
--- a/javascript/channels.js
+++ b/javascript/channels.js
@@ -22,54 +22,50 @@ channelsnames[11]="RTL8 HD";
channels[11]="S23.5E-3-3208-7036";
channelsnames[12]="Nickelodeon Nederland";
channels[12]="S19.2E-1-1078-28679";
-channelsnames[13]="ComedyCentral";
-channels[13]="S23.5E-3-3211-20826";
-channelsnames[14]="Discovery Channel";
-channels[14]="S23.5E-3-3211-20833";
-channelsnames[15]="Animal Planet";
-channels[15]="S23.5E-3-3202-6040";
-channelsnames[16]="Investigation Discovery";
-channels[16]="S23.5E-3-3202-6045";
-channelsnames[17]="Crime Invest.";
-channels[17]="S23.5E-3-3208-7052";
-channelsnames[18]="MOTORS TV";
-channels[18]="S19.2E-1-1110-9509";
-channelsnames[19]="Food Network";
-channels[19]="S23.5E-3-3211-20836";
-channelsnames[20]="Fine Living";
-channels[20]="S23.5E-3-3211-20834";
-channelsnames[21]="EDGE";
-channels[21]="S23.5E-3-3202-6111";
-channelsnames[22]="NPO Politiek/NPO Best";
-channels[22]="S23.5E-3-3202-6010";
-channelsnames[23]="NPO 101TV";
-channels[23]="S23.5E-3-3202-6015";
-channelsnames[24]="NPO Zapp Xtra/NPO Humor TV";
-channels[24]="S23.5E-3-3202-6025";
-channelsnames[25]="NostalgieNet";
-channels[25]="S23.5E-3-3222-20956";
-channelsnames[30]="TV Oost";
-channels[30]="S23.5E-3-3211-20814";
-channelsnames[31]="Omrop Fryslan Televisie";
-channels[31]="S23.5E-3-3211-20808";
-channelsnames[32]="TV Noord";
-channels[32]="S23.5E-3-3211-20810";
-channelsnames[33]="TV Gelderland";
-channels[33]="S23.5E-3-3211-20816";
-channelsnames[34]="Omroep Zeeland Televisie";
-channels[34]="S23.5E-3-3211-20818";
-channelsnames[35]="TV Drenthe";
-channels[35]="S23.5E-3-3211-20812";
-channelsnames[36]="TV West";
-channels[36]="S23.5E-3-3211-20804";
-channelsnames[37]="Omroep Brabant Televisie";
-channels[37]="S23.5E-3-3211-20820";
-channelsnames[38]="Regio BE";
-channels[38]="S23.5E-3-3202-6055";
-channelsnames[39]="AT5";
-channels[39]="S23.5E-3-3225-21012";
-channelsnames[40]="L1MBURG";
-channels[40]="S23.5E-3-3208-7050";
+channelsnames[13]="SBS9";
+channels[13]="S23.5E-3-3222-20945";
+channelsnames[14]="ComedyCentral";
+channels[14]="S23.5E-3-3211-20826";
+channelsnames[15]="FOX Channel";
+channels[15]="S23.5E-3-3202-6030";
+channelsnames[16]="FOXlife";
+channels[16]="S23.5E-3-3225-21055";
+channelsnames[17]="RTL lounge";
+channels[17]="S23.5E-3-3208-7042";
+channelsnames[18]="13th Street";
+channels[18]="S23.5E-3-3222-20966";
+channelsnames[19]="SyFy";
+channels[19]="S23.5E-3-3208-7054";
+channelsnames[20]="Discovery Channel";
+channels[20]="S23.5E-3-3211-20833";
+channelsnames[21]="Discovery Showcase HD";
+channels[21]="S23.5E-3-3205-5033";
+channelsnames[22]="TLC";
+channels[22]="S23.5E-3-3222-20949";
+channelsnames[23]="Animal Planet";
+channels[23]="S23.5E-3-3202-6040";
+channelsnames[24]="Investigation Discovery";
+channels[24]="S23.5E-3-3202-6045";
+channelsnames[25]="Crime Invest.";
+channels[25]="S23.5E-3-3208-7052";
+channelsnames[26]="MOTORS TV";
+channels[26]="S19.2E-1-1110-9509";
+channelsnames[27]="Food Network";
+channels[27]="S23.5E-3-3211-20836";
+channelsnames[28]="Fine Living";
+channels[28]="S23.5E-3-3211-20834";
+channelsnames[29]="EDGE";
+channels[29]="S23.5E-3-3202-6111";
+channelsnames[30]="NPO Politiek/NPO Best";
+channels[30]="S23.5E-3-3202-6010";
+channelsnames[31]="NPO DOC";
+channels[31]="S23.5E-3-3202-6015";
+channelsnames[32]="NPO Zapp Xtra/NPO Humor TV";
+channels[32]="S23.5E-3-3202-6025";
+channelsnames[33]="NostalgieNet";
+channels[33]="S23.5E-3-3222-20956";
+channelsnames[34]="13th Street";
+channels[34]="S23.5E-3-3211-20809";
channelsnames[41]="een";
channels[41]="S19.2E-53-1119-12801";
channelsnames[42]="Canvas";
@@ -86,6 +82,8 @@ channelsnames[47]="Vitaya";
channels[47]="S23.5E-3-3222-21120";
channelsnames[48]="Acht";
channels[48]="S23.5E-3-3222-21122";
+channelsnames[49]="Regio BE";
+channels[49]="S23.5E-3-3202-6055";
channelsnames[50]="DMAX";
channels[50]="S19.2E-133-33-63";
channelsnames[51]="Discovery";
@@ -160,6 +158,26 @@ channelsnames[85]="Real Time";
channels[85]="S13.0E-64511-5700-4324";
channelsnames[86]="Real Time +1";
channels[86]="S13.0E-64511-800-1469";
+channelsnames[90]="TV Oost";
+channels[90]="S23.5E-3-3211-20814";
+channelsnames[91]="Omrop Fryslan Televisie";
+channels[91]="S23.5E-3-3211-20808";
+channelsnames[92]="TV Noord";
+channels[92]="S23.5E-3-3211-20810";
+channelsnames[93]="TV Gelderland";
+channels[93]="S23.5E-3-3211-20816";
+channelsnames[94]="Omroep Zeeland Televisie";
+channels[94]="S23.5E-3-3211-20818";
+channelsnames[95]="TV Drenthe";
+channels[95]="S23.5E-3-3211-20812";
+channelsnames[96]="TV West";
+channels[96]="S23.5E-3-3211-20804";
+channelsnames[97]="Omroep Brabant Televisie";
+channels[97]="S23.5E-3-3211-20820";
+channelsnames[98]="AT5";
+channels[98]="S23.5E-3-3225-21012";
+channelsnames[99]="L1MBURG";
+channels[99]="S23.5E-3-3208-7050";
channelsnames[100]="Sky Premiere";
channels[100]="S28.2E-2-2007-4404";
channelsnames[101]="Sky Prem+1";
@@ -174,7 +192,7 @@ channelsnames[105]="Sky Family";
channels[105]="S28.2E-2-2007-4403";
channelsnames[106]="Sky Crime";
channels[106]="S28.2E-2-2007-4406";
-channelsnames[107]="Sky Christmas";
+channelsnames[107]="Sky Valentine";
channels[107]="S28.2E-2-2007-5502";
channelsnames[108]="Sky ScFi/Horror";
channels[108]="S28.2E-2-2007-4304";
@@ -188,9 +206,9 @@ channelsnames[112]="TCM";
channels[112]="S28.2E-2-2055-6038";
channelsnames[113]="TCM+1";
channels[113]="S28.2E-2-2301-52175";
-channelsnames[114]="Christmas 24";
+channelsnames[114]="Movies 24";
channels[114]="S28.2E-2-2303-52265";
-channelsnames[115]="Christmas 24+";
+channelsnames[115]="Movies 24+";
channels[115]="S28.2E-2-2303-52270";
channelsnames[116]="HBO";
channels[116]="S23.5E-3-3209-13104";
@@ -216,10 +234,8 @@ channelsnames[135]="HBO 2";
channels[135]="S23.5E-3-3202-6067";
channelsnames[136]="HBO 3";
channels[136]="S23.5E-3-3202-6068";
-channelsnames[137]="Film+ CZ";
-channels[137]="S23.5E-3-3211-20863";
-channelsnames[138]="MGM";
-channels[138]="S23.5E-3-3210-5072";
+channelsnames[137]="MGM";
+channels[137]="S23.5E-3-3210-5072";
channelsnames[150]="RTL Crime";
channels[150]="S19.2E-133-1-27";
channelsnames[151]="RTLNITRO";
@@ -260,18 +276,6 @@ channelsnames[168]="Watch";
channels[168]="S28.2E-2-2006-6520";
channelsnames[169]="Watch +1";
channels[169]="S28.2E-2-2015-7615";
-channelsnames[180]="RTL lounge";
-channels[180]="S23.5E-3-3208-7042";
-channelsnames[181]="TLC";
-channels[181]="S23.5E-3-3222-20949";
-channelsnames[182]="13th Street";
-channels[182]="S23.5E-3-3222-20966";
-channelsnames[183]="SyFy";
-channels[183]="S23.5E-3-3208-7054";
-channelsnames[190]="FOX Channel";
-channels[190]="S23.5E-3-3202-6030";
-channelsnames[191]="FOXlife";
-channels[191]="S23.5E-3-3225-21055";
channelsnames[201]="BBC One Lon";
channels[201]="S28.2E-2-2045-6301";
channelsnames[202]="BBC Two Eng";
@@ -356,7 +360,7 @@ channelsnames[250]="True Drama";
channels[250]="S28.2E-2-2314-53380";
channelsnames[251]="True Ent";
channels[251]="S28.2E-2-2314-53375";
-channelsnames[252]="True Christmas";
+channelsnames[252]="True Movies 1";
channels[252]="S28.2E-2-2314-53320";
channelsnames[253]="True Movies 2";
channels[253]="S28.2E-2-2314-53325";
@@ -418,16 +422,14 @@ channelsnames[283]="Fitness TV";
channels[283]="S28.2E-2-2602-54165";
channelsnames[284]="BET|BlackEntTv";
channels[284]="S28.2E-2-2079-51081";
-channelsnames[285]="BET +1 OBSOLETE";
-channels[285]="S28.2E-2-2079-51082";
-channelsnames[286]="Information TV";
-channels[286]="S28.2E-2-2313-53230";
-channelsnames[287]="Irish TV";
-channels[287]="S28.2E-2-2313-53280";
-channelsnames[288]="Showcase 2";
-channels[288]="S28.2E-2-2601-54051";
-channelsnames[289]="Horse & Country";
-channels[289]="S28.2E-2-2076-54140";
+channelsnames[285]="Information TV";
+channels[285]="S28.2E-2-2313-53230";
+channelsnames[286]="Irish TV";
+channels[286]="S28.2E-2-2313-53280";
+channelsnames[287]="Showcase 2";
+channels[287]="S28.2E-2-2601-54051";
+channelsnames[288]="Horse & Country";
+channels[288]="S28.2E-2-2076-54140";
channelsnames[300]="CBBC";
channels[300]="S28.2E-2-2048-10352";
channelsnames[301]="CBeebies";
@@ -518,12 +520,10 @@ channelsnames[343]="JimJam";
channels[343]="S23.5E-3-3202-6003";
channelsnames[344]="JimJam CZ";
channels[344]="S23.5E-3-3202-6053";
-channelsnames[345]="Disney CZ";
-channels[345]="S23.5E-3-3211-20857";
-channelsnames[346]="KetOp12";
-channels[346]="S23.5E-3-3222-21112";
-channelsnames[347]="VTMKazoom/Kanaal Z";
-channels[347]="S23.5E-3-3222-21116";
+channelsnames[345]="KetOp12";
+channels[345]="S23.5E-3-3222-21112";
+channelsnames[346]="VTMKazoom/Kanaal Z";
+channels[346]="S23.5E-3-3222-21116";
channelsnames[401]="Das Erste";
channels[401]="S19.2E-1-1101-28106";
channelsnames[402]="ZDF";
@@ -648,7 +648,7 @@ channelsnames[476]="Sky Cinema+1,SkyCine1";
channels[476]="S19.2E-133-2-11";
channelsnames[477]="Sky Cinema+24,SkyCine24";
channels[477]="S19.2E-133-2-43";
-channelsnames[478]="Sky Star Wars,Star Wars";
+channelsnames[478]="Sky Hits,SkyHits";
channels[478]="S19.2E-133-3-41";
channelsnames[479]="Sky Cinema,Cinema";
channels[479]="S19.2E-133-2-10";
@@ -790,12 +790,6 @@ channelsnames[578]="Sport1 Voetbal";
channels[578]="S23.5E-3-3222-20925";
channelsnames[579]="Sport1 Golf";
channels[579]="S23.5E-3-3222-20930";
-channelsnames[580]="HBO HD";
-channels[580]="S23.5E-3-3205-5033";
-channelsnames[581]="Eurosport";
-channels[581]="S23.5E-3-3211-20809";
-channelsnames[582]="Eurosport CZ";
-channels[582]="S23.5E-3-3211-20859";
channelsnames[600]="DELUXE MUSIC,DELUXE";
channels[600]="S19.2E-133-7-65";
channelsnames[601]="Vintage TV";
@@ -832,9 +826,9 @@ channelsnames[616]="VH1";
channels[616]="S19.2E-1-1066-28656";
channelsnames[617]="MTV Music 24";
channels[617]="S19.2E-1-1078-28671";
-channelsnames[618]="NOW Christmas";
+channelsnames[618]="NOW Music";
channels[618]="S28.2E-2-2311-52010";
-channelsnames[619]="Blissmas";
+channelsnames[619]="Bliss";
channels[619]="S28.2E-2-2314-53305";
channelsnames[620]="Flava";
channels[620]="S28.2E-2-2314-53300";
@@ -844,7 +838,7 @@ channelsnames[622]="Chart Show TV";
channels[622]="S28.2E-2-2314-53365";
channelsnames[623]="Planet Pop";
channels[623]="S28.2E-2-2612-55114";
-channelsnames[624]="Dance Xmas";
+channelsnames[624]="Chartshw Dnce";
channels[624]="S28.2E-2-2314-53315";
channelsnames[625]="Clubland TV";
channels[625]="S28.2E-2-2612-55113";
@@ -870,7 +864,7 @@ channelsnames[635]="MTV";
channels[635]="S28.2E-2-2010-7010";
channelsnames[636]="MTV BASE";
channels[636]="S28.2E-2-2010-7007";
-channelsnames[637]="MTV XMAS";
+channelsnames[637]="MTV LOVE";
channels[637]="S28.2E-2-2010-7008";
channelsnames[638]="MTV DANCE";
channels[638]="S28.2E-2-2010-7014";
@@ -1018,60 +1012,56 @@ channelsnames[762]="GEO TV";
channels[762]="S28.2E-2-2311-52070";
channelsnames[800]="Music Box Russia";
channels[800]="S13.0E-318-11500-17316";
-channelsnames[801]="RUTV";
-channels[801]="S13.0E-318-600-17680";
-channelsnames[802]="1TVRUS Europe";
-channels[802]="S13.0E-318-9400-8208";
-channelsnames[803]="RTR";
-channels[803]="S13.0E-318-12600-1708";
-channelsnames[804]="THT COMEDY";
-channels[804]="S13.0E-318-12600-1703";
-channelsnames[805]="Rossiya 24";
-channels[805]="S13.0E-318-12600-1710";
-channelsnames[806]="Arise TV";
-channels[806]="S13.0E-318-15400-13527";
-channelsnames[807]="Soyuz TV";
-channels[807]="S13.0E-318-11500-17313";
-channelsnames[808]="RBC-TV";
-channels[808]="S13.0E-318-9000-8342";
-channelsnames[809]="RT DOC";
-channels[809]="S13.0E-318-6500-487";
-channelsnames[810]="R1";
-channels[810]="S13.0E-318-13000-14607";
-channelsnames[811]="TVRUS";
-channels[811]="S13.0E-318-15500-637";
-channelsnames[812]="Shanson TV";
-channels[812]="S13.0E-318-12600-1704";
-channelsnames[813]="ChildRussia";
-channels[813]="S13.0E-318-15300-813";
-channelsnames[814]="TBN Russia";
-channels[814]="S13.0E-318-15300-807";
-channelsnames[815]="CNL";
-channels[815]="S13.0E-318-11500-17312";
-channelsnames[816]="Euronews";
-channels[816]="S13.0E-318-9400-8211";
-channelsnames[817]="Russia Today";
-channels[817]="S13.0E-318-600-17629";
-channelsnames[818]="Newroz";
-channels[818]="S13.0E-318-15700-10608";
-channelsnames[819]="RTVi Europe";
-channels[819]="S13.0E-318-8100-14802";
-channelsnames[820]="inteRTV Nashe Kino";
-channels[820]="S13.0E-318-8100-14804";
-channelsnames[821]="inteRTV Detskii Mir - TeleClub";
-channels[821]="S13.0E-318-8100-14803";
-channelsnames[822]="ESP2 Rus";
-channels[822]="S13.0E-318-200-13813";
-channelsnames[823]="ESP Russian";
-channels[823]="S13.0E-318-200-13835";
-channelsnames[824]="ESP2 NE Russian";
-channels[824]="S13.0E-318-200-13883";
-channelsnames[825]="Khabar TV";
-channels[825]="S13.0E-318-7200-7220";
-channelsnames[826]="ARM_1";
-channels[826]="S13.0E-318-9400-8202";
-channelsnames[827]="TV9";
-channels[827]="S13.0E-318-15400-13505";
+channelsnames[801]="1TVRUS Europe";
+channels[801]="S13.0E-318-9400-8208";
+channelsnames[802]="RTR";
+channels[802]="S13.0E-318-12600-1708";
+channelsnames[803]="THT";
+channels[803]="S13.0E-318-12600-1703";
+channelsnames[804]="Rossiya 24";
+channels[804]="S13.0E-318-12600-1710";
+channelsnames[805]="Arise TV";
+channels[805]="S13.0E-318-15400-13527";
+channelsnames[806]="Soyuz TV";
+channels[806]="S13.0E-318-11500-17313";
+channelsnames[807]="RBC-TV";
+channels[807]="S13.0E-318-9000-8342";
+channelsnames[808]="RT DOC";
+channels[808]="S13.0E-318-6500-487";
+channelsnames[809]="R1";
+channels[809]="S13.0E-318-13000-14607";
+channelsnames[810]="TVRUS";
+channels[810]="S13.0E-318-15500-637";
+channelsnames[811]="Shanson TV";
+channels[811]="S13.0E-318-12600-1704";
+channelsnames[812]="ChildRussia";
+channels[812]="S13.0E-318-15300-813";
+channelsnames[813]="TBN Russia";
+channels[813]="S13.0E-318-15300-807";
+channelsnames[814]="CNL";
+channels[814]="S13.0E-318-11500-17312";
+channelsnames[815]="Euronews";
+channels[815]="S13.0E-318-9400-8211";
+channelsnames[816]="Russia Today";
+channels[816]="S13.0E-318-600-17629";
+channelsnames[817]="Newroz";
+channels[817]="S13.0E-318-15700-10608";
+channelsnames[818]="RTVi Europe";
+channels[818]="S13.0E-318-8100-14802";
+channelsnames[819]="inteRTV Nashe Kino";
+channels[819]="S13.0E-318-8100-14804";
+channelsnames[820]="inteRTV Detskii Mir - TeleClub";
+channels[820]="S13.0E-318-8100-14803";
+channelsnames[821]="ESP2 Rus";
+channels[821]="S13.0E-318-200-13813";
+channelsnames[822]="ESP Russian";
+channels[822]="S13.0E-318-200-13835";
+channelsnames[823]="ESP2 NE Russian";
+channels[823]="S13.0E-318-200-13883";
+channelsnames[824]="Khabar TV";
+channels[824]="S13.0E-318-7200-7220";
+channelsnames[825]="TV9";
+channels[825]="S13.0E-318-15400-13505";
channelsnames[840]="TVP1";
channels[840]="S19.2E-1-1059-7100";
channelsnames[841]="TVP2";
@@ -1150,8 +1140,6 @@ channelsnames[952]="Travel";
channels[952]="S5.0E-1-1-287";
channelsnames[953]="Discovery Travel";
channels[953]="S13.0E-64511-800-1465";
-channelsnames[954]="TV GLOBO";
-channels[954]="S13.0E-318-15400-13526";
channelsnames[1001]="NPO1 HD";
channels[1001]="S23.5E-3-3225-21029";
channelsnames[1002]="NPO2 HD";
@@ -1188,14 +1176,12 @@ channelsnames[1018]="EDGE CZ";
channels[1018]="S23.5E-3-3202-6151";
channelsnames[1019]="Boomerang CZ";
channels[1019]="S23.5E-3-3202-6036";
-channelsnames[1020]="Discovery CZ";
-channels[1020]="S23.5E-3-3211-20855";
-channelsnames[1021]="Food Network CZ";
-channels[1021]="S23.5E-3-3211-20837";
-channelsnames[1022]="Fine Living CZ";
-channels[1022]="S23.5E-3-3211-20835";
-channelsnames[1023]="Discovery HD CZ";
-channels[1023]="S23.5E-3-3208-7011";
+channelsnames[1020]="Food Network CZ";
+channels[1020]="S23.5E-3-3211-20837";
+channelsnames[1021]="Fine Living CZ";
+channels[1021]="S23.5E-3-3211-20835";
+channelsnames[1022]="Discovery HD CZ";
+channels[1022]="S23.5E-3-3208-7011";
channelsnames[1041]="een HD";
channels[1041]="S23.5E-3-3225-21025";
channelsnames[1042]="Canvas HD";
@@ -1214,7 +1200,7 @@ channelsnames[1105]="Sky Family HD";
channels[1105]="S28.2E-2-2016-3818";
channelsnames[1106]="Sky Crime HD";
channels[1106]="S28.2E-2-2016-3862";
-channelsnames[1107]="Sky ChristmsHD";
+channelsnames[1107]="Sky ValentneHD";
channels[1107]="S28.2E-2-2024-3816";
channelsnames[1108]="Sky ScFi/HorHD";
channels[1108]="S28.2E-2-2024-3817";
@@ -1226,8 +1212,8 @@ channelsnames[1111]="Sky Disney HD";
channels[1111]="S28.2E-2-2024-3900";
channelsnames[1112]="TCM HD";
channels[1112]="S28.2E-2-2027-3906";
-channelsnames[1150]="Syfy HD OBSOLETE";
-channels[1150]="S28.2E-2-2032-3874";
+channelsnames[1150]="Syfy HD";
+channels[1150]="S28.2E-2-2035-3884";
channelsnames[1151]="Universal HD";
channels[1151]="S28.2E-2-2035-3880";
channelsnames[1152]="ComedyCentHD";
@@ -1356,7 +1342,7 @@ channelsnames[1453]="NatGeo HD,NatGeoHD";
channels[1453]="S19.2E-133-13-112";
channelsnames[1454]="History HD OBSOLETE,HistHD";
channels[1454]="S19.2E-133-13-113";
-channelsnames[1455]="Sky Star Wars HD,Star Wars HD";
+channelsnames[1455]="Sky Hits HD,SkyHitsHD";
channels[1455]="S19.2E-133-12-107";
channelsnames[1456]="Sky Action HD OBSOLETE,Action HD";
channels[1456]="S19.2E-133-12-106";
@@ -1524,362 +1510,354 @@ channelsnames[2026]="Odisseia";
channels[2026]="S30.0W-54-42-973";
channelsnames[2050]="CANAL+1 HD";
channels[2050]="S30.0W-49-3-150";
-channelsnames[2051]="ANDALUCÍA TV";
-channels[2051]="S30.0W-49-3-300";
-channelsnames[2052]="TAQUILLA HD";
-channels[2052]="S30.0W-49-3-1119";
-channelsnames[2053]="CANAL+ 3D";
-channels[2053]="S30.0W-49-3-1123";
-channelsnames[2054]="MEZZO LIVEHD";
-channels[2054]="S30.0W-49-3-1221";
-channelsnames[2055]="C+ DEP 2 HD";
-channels[2055]="S30.0W-49-3-1224";
-channelsnames[2056]="C+ CABLE";
-channels[2056]="S30.0W-49-3-1801";
-channelsnames[2057]="ANTENA 3";
-channels[2057]="S30.0W-49-7-13";
-channelsnames[2058]="RMTV";
-channels[2058]="S30.0W-49-7-62";
-channelsnames[2059]="C+ infoDEPORTE OBSOLETE";
-channels[2059]="S30.0W-49-7-69";
-channelsnames[2060]="NEOX";
-channels[2060]="S30.0W-49-7-96";
-channelsnames[2061]="C+ TAQUILLA";
-channels[2061]="S30.0W-49-7-120";
-channelsnames[2062]="CANAL+ 2";
-channels[2062]="S30.0W-49-2-2";
-channelsnames[2063]="COMEDY CENTRAL";
-channels[2063]="S30.0W-49-2-23";
-channelsnames[2064]="VIAJAR";
-channels[2064]="S30.0W-49-2-34";
-channelsnames[2065]="CANAL COCINA";
-channels[2065]="S30.0W-49-2-37";
-channelsnames[2066]="TCM";
-channels[2066]="S30.0W-49-2-45";
-channelsnames[2067]="DISNEY CH.";
-channels[2067]="S30.0W-49-2-70";
-channelsnames[2068]="R. Informativas";
-channels[2068]="S30.0W-49-2-363";
-channelsnames[2069]="R. Musicales";
-channels[2069]="S30.0W-49-2-364";
-channelsnames[2070]="RADIO MARIA";
-channels[2070]="S30.0W-40-13-8";
-channelsnames[2071]="Cadena 100";
-channels[2071]="S30.0W-40-13-10";
-channelsnames[2072]="HIT FM";
-channels[2072]="S30.0W-40-13-26";
-channelsnames[2073]="Radio MARCA";
-channels[2073]="S30.0W-40-13-29";
-channelsnames[2074]="COPE";
-channels[2074]="S30.0W-40-13-37";
-channelsnames[2075]="INTERECONOMIA";
-channels[2075]="S30.0W-40-13-38";
-channelsnames[2076]="MegaStar";
-channels[2076]="S30.0W-40-13-39";
-channelsnames[2077]="ROCK FM";
-channels[2077]="S30.0W-40-13-52";
-channelsnames[2078]="EMA RADIO";
-channels[2078]="S30.0W-40-13-54";
-channelsnames[2079]="TSF ON M";
-channels[2079]="S30.0W-40-13-55";
-channelsnames[2080]="RADIO HIT";
-channels[2080]="S30.0W-40-13-58";
-channelsnames[2081]="Disney Channel";
-channels[2081]="S30.0W-40-13-900";
-channelsnames[2082]="24 HORAS";
-channels[2082]="S30.0W-49-9-70";
-channelsnames[2083]="SIC";
-channels[2083]="S30.0W-54-36-813";
-channelsnames[2084]="Slide TSCS 2";
-channels[2084]="S30.0W-54-37-712";
-channelsnames[2085]="BBC World News";
-channels[2085]="S30.0W-54-37-717";
-channelsnames[2086]="Sport TV 1";
-channels[2086]="S30.0W-54-38-870";
-channelsnames[2087]="AR TV";
-channels[2087]="S30.0W-54-40-501";
-channelsnames[2088]="Toros TV";
-channels[2088]="S30.0W-54-41-602";
-channelsnames[2089]="CANAL+ LIGA";
-channels[2089]="S30.0W-49-3-1800";
-channelsnames[2090]="Canal Extremadura SAT";
-channels[2090]="S30.0W-2-15-4";
-channelsnames[2091]="Feeds 2 TSA";
-channels[2091]="S30.0W-2-15-5";
-channelsnames[2092]="Feeds 3 TSA";
-channels[2092]="S30.0W-2-15-6";
-channelsnames[2093]="HIGH TV 3D";
-channels[2093]="S30.0W-2-15-11";
-channelsnames[2094]="CANAL+ 1";
-channels[2094]="S30.0W-49-2-1";
-channelsnames[2095]="C+ DCINE";
-channels[2095]="S30.0W-49-4-43";
-channelsnames[2096]="CANAL+1 ...30";
-channels[2096]="S30.0W-49-4-3";
-channelsnames[2097]="FOX";
-channels[2097]="S30.0W-49-4-21";
-channelsnames[2098]="AXN";
-channels[2098]="S30.0W-49-4-22";
-channelsnames[2099]="FOX LIFE";
-channels[2099]="S30.0W-49-4-27";
-channelsnames[2100]="AXN WHITE";
-channels[2100]="S30.0W-49-4-28";
-channelsnames[2101]="C+ ACCIÓN";
-channels[2101]="S30.0W-49-4-41";
-channelsnames[2102]="C+ COMEDIA";
-channels[2102]="S30.0W-49-4-42";
-channelsnames[2103]="EL GARAGE TV";
-channels[2103]="S30.0W-49-4-64";
-channelsnames[2104]="NOVA";
-channels[2104]="S30.0W-49-4-95";
-channelsnames[2105]="Paquetes";
-channels[2105]="S30.0W-49-4-1001";
-channelsnames[2106]="C+LIGA MULTI";
-channels[2106]="S30.0W-49-6-52";
-channelsnames[2107]="C+ TOROS";
-channels[2107]="S30.0W-49-6-67";
-channelsnames[2108]="TAQUILLA 5";
-channels[2108]="S30.0W-49-6-125";
-channelsnames[2109]="TAQUILLA 6";
-channels[2109]="S30.0W-49-6-126";
-channelsnames[2110]="TAQUILLA 7";
-channels[2110]="S30.0W-49-6-127";
-channelsnames[2111]="TAQUILLA 8";
-channels[2111]="S30.0W-49-6-128";
-channelsnames[2112]="TAQUILLAX";
-channels[2112]="S30.0W-49-6-131";
-channelsnames[2113]="TAQUILLAXX";
-channels[2113]="S30.0W-49-6-132";
-channelsnames[2114]="TAQ XXHARD";
-channels[2114]="S30.0W-49-6-133";
-channelsnames[2115]="MULTI-X (1)";
-channels[2115]="S30.0W-49-6-136";
-channelsnames[2116]="MULTI-X (2)";
-channels[2116]="S30.0W-49-6-137";
-channelsnames[2117]="C+LCampeones";
-channels[2117]="S30.0W-49-6-141";
-channelsnames[2118]="C+LCampeon2";
-channels[2118]="S30.0W-49-6-142";
-channelsnames[2119]="C+LCampeon3";
-channels[2119]="S30.0W-49-6-143";
-channelsnames[2120]="MULTIDEP.6";
-channels[2120]="S30.0W-49-6-195";
-channelsnames[2121]="MULTIDEP.7";
-channels[2121]="S30.0W-49-6-196";
-channelsnames[2122]="PUBLIACTIVA";
-channels[2122]="S30.0W-49-6-347";
-channelsnames[2123]="TVCine 2";
-channels[2123]="S30.0W-54-42-700";
-channelsnames[2124]="Nickelodeon";
-channels[2124]="S30.0W-54-42-701";
-channelsnames[2125]="TVCine 3";
-channels[2125]="S30.0W-54-42-706";
-channelsnames[2126]="TVCine 1";
-channels[2126]="S30.0W-54-42-707";
-channelsnames[2127]="TVCine 4";
-channels[2127]="S30.0W-54-42-709";
-channelsnames[2128]="MOV";
-channels[2128]="S30.0W-54-42-711";
-channelsnames[2129]="TVE Internacional";
-channels[2129]="S30.0W-54-42-713";
-channelsnames[2130]="National Geographic";
-channels[2130]="S30.0W-54-42-714";
-channelsnames[2131]="TV Globo Portugal";
-channels[2131]="S30.0W-54-42-904";
-channelsnames[2132]="RTP Madeira";
-channels[2132]="S30.0W-54-42-935";
-channelsnames[2133]="Canal de Teste";
-channels[2133]="S30.0W-54-36-1";
-channelsnames[2134]="RTP Informação";
-channels[2134]="S30.0W-54-36-101";
-channelsnames[2135]="Panda Biggs";
-channels[2135]="S30.0W-54-36-102";
-channelsnames[2136]="Canal de Teste";
-channels[2136]="S30.0W-54-36-111";
-channelsnames[2137]="Canal Panda";
-channels[2137]="S30.0W-54-36-708";
-channelsnames[2138]="SIC Notícias";
-channels[2138]="S30.0W-54-36-801";
-channelsnames[2139]="RTP 1";
-channels[2139]="S30.0W-54-36-811";
-channelsnames[2140]="RTP 2";
-channels[2140]="S30.0W-54-36-812";
-channelsnames[2141]="TVI";
-channels[2141]="S30.0W-54-36-814";
-channelsnames[2142]="Sport TV Golfe";
-channels[2142]="S30.0W-54-37-219";
-channelsnames[2143]="Eurosport News";
-channels[2143]="S30.0W-54-37-227";
-channelsnames[2144]="TVE 24h";
-channels[2144]="S30.0W-54-37-228";
-channelsnames[2145]="EuroNews";
-channels[2145]="S30.0W-54-37-702";
-channelsnames[2146]="SIC Mulher";
-channels[2146]="S30.0W-54-37-703";
-channelsnames[2147]="TLC";
-channels[2147]="S30.0W-54-37-704";
-channelsnames[2148]="France 24";
-channels[2148]="S30.0W-54-37-720";
-channelsnames[2149]="Hot";
-channels[2149]="S30.0W-54-37-831";
-channelsnames[2150]="SLIDE TSCS2";
-channels[2150]="S30.0W-54-37-961";
-channelsnames[2151]="CNN";
-channels[2151]="S30.0W-54-37-962";
-channelsnames[2152]="Mezzo";
-channels[2152]="S30.0W-54-37-965";
-channelsnames[2153]="SKY News";
-channels[2153]="S30.0W-54-37-966";
-channelsnames[2154]="MEZZO";
-channels[2154]="S30.0W-54-37-2000";
-channelsnames[2155]="BBC WORLD";
-channels[2155]="S30.0W-54-37-2001";
-channelsnames[2156]="CNN INT";
-channels[2156]="S30.0W-54-37-2002";
-channelsnames[2157]="CNBC";
-channels[2157]="S30.0W-54-37-2005";
-channelsnames[2158]="EURONEWS";
-channels[2158]="S30.0W-54-37-2006";
-channelsnames[2159]="FRANCE 24 ENG";
-channels[2159]="S30.0W-54-37-2007";
-channelsnames[2160]="NG_DVR_5.4";
-channels[2160]="S30.0W-54-38-19";
-channelsnames[2161]="NG_Zapper_3.8";
-channels[2161]="S30.0W-54-38-20";
-channelsnames[2162]="NG_DVR_3.8";
-channels[2162]="S30.0W-54-38-21";
-channelsnames[2163]="NG_ZAPPER_5.8";
-channels[2163]="S30.0W-54-38-22";
-channelsnames[2164]="NG_DVR_5.8";
-channels[2164]="S30.0W-54-38-23";
-channelsnames[2165]="Playboy TV";
-channels[2165]="S30.0W-54-38-169";
-channelsnames[2166]="Sport TV 2";
-channels[2166]="S30.0W-54-38-301";
-channelsnames[2167]="Canal de teste";
-channels[2167]="S30.0W-54-38-302";
-channelsnames[2168]="AR TV";
-channels[2168]="S30.0W-54-38-303";
-channelsnames[2169]="Globo";
-channels[2169]="S30.0W-54-38-304";
-channelsnames[2170]="TVI 24";
-channels[2170]="S30.0W-54-38-305";
-channelsnames[2171]="Sport TV 3";
-channels[2171]="S30.0W-54-38-306";
-channelsnames[2172]="TV Record";
-channels[2172]="S30.0W-54-38-308";
-channelsnames[2173]="Sport TV Live";
-channels[2173]="S30.0W-54-38-309";
-channelsnames[2174]="RTP Memória";
-channels[2174]="S30.0W-54-38-310";
-channelsnames[2175]="Eurosport";
-channels[2175]="S30.0W-54-38-312";
-channelsnames[2176]="Hollywood";
-channels[2176]="S30.0W-54-38-313";
-channelsnames[2177]="MOV";
-channels[2177]="S30.0W-54-38-314";
-channelsnames[2178]="Canal de Teste";
-channels[2178]="S30.0W-54-38-701";
-channelsnames[2179]="SIC Radical";
-channels[2179]="S30.0W-54-40-502";
-channelsnames[2180]="Panda Biggs";
-channels[2180]="S30.0W-54-40-503";
-channelsnames[2181]="BBC Entertainment";
-channels[2181]="S30.0W-54-40-506";
-channelsnames[2182]="E! Entertainment";
-channels[2182]="S30.0W-54-40-507";
-channelsnames[2183]="Baby First";
-channels[2183]="S30.0W-54-40-509";
-channelsnames[2184]="Caça e Pesca";
-channels[2184]="S30.0W-54-40-933";
-channelsnames[2185]="Disney Junior";
-channels[2185]="S30.0W-54-40-939";
-channelsnames[2186]="CBS Reality";
-channels[2186]="S30.0W-54-41-604";
-channelsnames[2187]="RTP Açores";
-channels[2187]="S30.0W-54-41-605";
-channelsnames[2188]="NBA TV";
-channels[2188]="S30.0W-54-41-609";
-channelsnames[2189]="Canção Nova";
-channels[2189]="S30.0W-54-41-610";
-channelsnames[2190]="Novo SD TSCS6- 01";
-channels[2190]="S30.0W-54-41-611";
-channelsnames[2191]="Cartoon / TCM";
-channels[2191]="S30.0W-54-41-613";
-channelsnames[2192]="Canal Q";
-channels[2192]="S30.0W-54-41-959";
-channelsnames[2193]="C+ YOMVI";
-channels[2193]="S30.0W-49-9-7";
-channelsnames[2194]="COSMOPOLITAN";
-channels[2194]="S30.0W-49-9-26";
-channelsnames[2195]="HISTORIA";
-channels[2195]="S30.0W-49-9-35";
-channelsnames[2196]="BIO";
-channels[2196]="S30.0W-49-9-36";
-channelsnames[2197]="CINEMAGIC";
-channels[2197]="S30.0W-49-9-44";
-channelsnames[2198]="DCINEESPAÑOL";
-channels[2198]="S30.0W-49-9-48";
-channelsnames[2199]="EUROSPORT";
-channels[2199]="S30.0W-49-9-60";
-channelsnames[2200]="CAZA Y PESCA";
-channels[2200]="S30.0W-49-9-66";
-channelsnames[2201]="DISNEY XD";
-channels[2201]="S30.0W-49-9-72";
-channelsnames[2202]="CINEMAGIC";
-channels[2202]="S30.0W-49-9-73";
-channelsnames[2203]="24 HORAS";
-channels[2203]="S30.0W-49-9-100";
-channelsnames[2204]="BLOOMBERG";
-channels[2204]="S30.0W-49-9-102";
-channelsnames[2205]="Eventos";
-channels[2205]="S30.0W-49-9-500";
-channelsnames[2206]="Caça e Pesca";
-channels[2206]="S30.0W-49-9-3000";
-channelsnames[2207]="Eurosport";
-channels[2207]="S30.0W-49-9-3002";
-channelsnames[2208]="Canal de História";
-channels[2208]="S30.0W-49-9-3003";
-channelsnames[2209]="Bloomberg";
-channels[2209]="S30.0W-49-9-3004";
-channelsnames[2210]="TVE 24h";
-channels[2210]="S30.0W-49-9-3006";
-channelsnames[2211]="MTV ESPAÑA";
-channels[2211]="S30.0W-49-5-29";
-channelsnames[2212]="LTC";
-channels[2212]="S30.0W-49-5-39";
-channelsnames[2213]="BARÇA TV";
-channels[2213]="S30.0W-49-5-63";
-channelsnames[2214]="MOTORS TV";
-channels[2214]="S30.0W-49-5-65";
-channelsnames[2215]="DIVINITY";
-channels[2215]="S30.0W-49-5-90";
-channelsnames[2216]="ENERGY";
-channels[2216]="S30.0W-49-5-91";
-channelsnames[2217]="FOX NEWS";
-channels[2217]="S30.0W-49-5-105";
-channelsnames[2218]="C.ESTRELLAS";
-channels[2218]="S30.0W-49-5-117";
-channelsnames[2219]="C+ MultiCINE";
-channels[2219]="S30.0W-49-8-6";
-channelsnames[2220]="C+ MultiCINE";
-channels[2220]="S30.0W-49-8-40";
-channelsnames[2221]="C+ MultiDEP";
-channels[2221]="S30.0W-49-8-50";
-channelsnames[2222]="NICKELODEON";
-channels[2222]="S30.0W-49-8-74";
-channelsnames[2223]="TAQUILLA 1";
-channels[2223]="S30.0W-49-8-121";
-channelsnames[2224]="TAQUILLA 2";
-channels[2224]="S30.0W-49-8-122";
-channelsnames[2225]="TAQUILLA 3";
-channels[2225]="S30.0W-49-8-123";
-channelsnames[2226]="TAQUILLA 4";
-channels[2226]="S30.0W-49-8-124";
-channelsnames[2227]="TAQUILLA X";
-channels[2227]="S30.0W-49-8-139";
-channelsnames[2228]="MULTIDEP.4";
-channels[2228]="S30.0W-49-8-193";
+channelsnames[2051]="TAQUILLA HD";
+channels[2051]="S30.0W-49-3-1119";
+channelsnames[2052]="CANAL+ 3D";
+channels[2052]="S30.0W-49-3-1123";
+channelsnames[2053]="MEZZO LIVEHD";
+channels[2053]="S30.0W-49-3-1221";
+channelsnames[2054]="C+ CABLE";
+channels[2054]="S30.0W-49-3-1801";
+channelsnames[2055]="ANTENA 3";
+channels[2055]="S30.0W-49-7-13";
+channelsnames[2056]="RMTV";
+channels[2056]="S30.0W-49-7-62";
+channelsnames[2057]="NEOX";
+channels[2057]="S30.0W-49-7-96";
+channelsnames[2058]="C+ TAQUILLA";
+channels[2058]="S30.0W-49-7-120";
+channelsnames[2059]="CANAL+ 2";
+channels[2059]="S30.0W-49-2-2";
+channelsnames[2060]="COMEDY CENTRAL";
+channels[2060]="S30.0W-49-2-23";
+channelsnames[2061]="VIAJAR";
+channels[2061]="S30.0W-49-2-34";
+channelsnames[2062]="CANAL COCINA";
+channels[2062]="S30.0W-49-2-37";
+channelsnames[2063]="TCM";
+channels[2063]="S30.0W-49-2-45";
+channelsnames[2064]="DISNEY CH.";
+channels[2064]="S30.0W-49-2-70";
+channelsnames[2065]="R. Informativas";
+channels[2065]="S30.0W-49-2-363";
+channelsnames[2066]="R. Musicales";
+channels[2066]="S30.0W-49-2-364";
+channelsnames[2067]="RADIO MARIA";
+channels[2067]="S30.0W-40-13-8";
+channelsnames[2068]="Cadena 100";
+channels[2068]="S30.0W-40-13-10";
+channelsnames[2069]="HIT FM";
+channels[2069]="S30.0W-40-13-26";
+channelsnames[2070]="Radio MARCA";
+channels[2070]="S30.0W-40-13-29";
+channelsnames[2071]="COPE";
+channels[2071]="S30.0W-40-13-37";
+channelsnames[2072]="INTERECONOMIA";
+channels[2072]="S30.0W-40-13-38";
+channelsnames[2073]="MegaStar";
+channels[2073]="S30.0W-40-13-39";
+channelsnames[2074]="ROCK FM";
+channels[2074]="S30.0W-40-13-52";
+channelsnames[2075]="EMA RADIO";
+channels[2075]="S30.0W-40-13-54";
+channelsnames[2076]="TSF ON M";
+channels[2076]="S30.0W-40-13-55";
+channelsnames[2077]="RADIO HIT";
+channels[2077]="S30.0W-40-13-58";
+channelsnames[2078]="Disney Channel";
+channels[2078]="S30.0W-40-13-900";
+channelsnames[2079]="24 HORAS";
+channels[2079]="S30.0W-49-9-70";
+channelsnames[2080]="SIC";
+channels[2080]="S30.0W-54-36-813";
+channelsnames[2081]="Slide TSCS 2";
+channels[2081]="S30.0W-54-37-712";
+channelsnames[2082]="BBC World News";
+channels[2082]="S30.0W-54-37-717";
+channelsnames[2083]="Sport TV 1";
+channels[2083]="S30.0W-54-38-870";
+channelsnames[2084]="AR TV";
+channels[2084]="S30.0W-54-40-501";
+channelsnames[2085]="Toros TV";
+channels[2085]="S30.0W-54-41-602";
+channelsnames[2086]="CANAL+ LIGA";
+channels[2086]="S30.0W-49-3-1800";
+channelsnames[2087]="Canal Extremadura SAT";
+channels[2087]="S30.0W-2-15-4";
+channelsnames[2088]="Feeds 2 TSA";
+channels[2088]="S30.0W-2-15-5";
+channelsnames[2089]="Feeds 3 TSA";
+channels[2089]="S30.0W-2-15-6";
+channelsnames[2090]="CANAL+ 1";
+channels[2090]="S30.0W-49-2-1";
+channelsnames[2091]="C+ DCINE";
+channels[2091]="S30.0W-49-4-43";
+channelsnames[2092]="CANAL+1 ...30";
+channels[2092]="S30.0W-49-4-3";
+channelsnames[2093]="FOX";
+channels[2093]="S30.0W-49-4-21";
+channelsnames[2094]="AXN";
+channels[2094]="S30.0W-49-4-22";
+channelsnames[2095]="FOX LIFE";
+channels[2095]="S30.0W-49-4-27";
+channelsnames[2096]="AXN WHITE";
+channels[2096]="S30.0W-49-4-28";
+channelsnames[2097]="C+ ACCIÓN";
+channels[2097]="S30.0W-49-4-41";
+channelsnames[2098]="C+ COMEDIA";
+channels[2098]="S30.0W-49-4-42";
+channelsnames[2099]="EL GARAGE TV";
+channels[2099]="S30.0W-49-4-64";
+channelsnames[2100]="NOVA";
+channels[2100]="S30.0W-49-4-95";
+channelsnames[2101]="Paquetes";
+channels[2101]="S30.0W-49-4-1001";
+channelsnames[2102]="C+LIGA MULTI";
+channels[2102]="S30.0W-49-6-52";
+channelsnames[2103]="C+ TOROS";
+channels[2103]="S30.0W-49-6-67";
+channelsnames[2104]="TAQUILLA 5";
+channels[2104]="S30.0W-49-6-125";
+channelsnames[2105]="TAQUILLA 6";
+channels[2105]="S30.0W-49-6-126";
+channelsnames[2106]="TAQUILLA 7";
+channels[2106]="S30.0W-49-6-127";
+channelsnames[2107]="TAQUILLA 8";
+channels[2107]="S30.0W-49-6-128";
+channelsnames[2108]="TAQUILLAX";
+channels[2108]="S30.0W-49-6-131";
+channelsnames[2109]="TAQUILLAXX";
+channels[2109]="S30.0W-49-6-132";
+channelsnames[2110]="TAQ XXHARD";
+channels[2110]="S30.0W-49-6-133";
+channelsnames[2111]="MULTI-X (1)";
+channels[2111]="S30.0W-49-6-136";
+channelsnames[2112]="MULTI-X (2)";
+channels[2112]="S30.0W-49-6-137";
+channelsnames[2113]="C+LCampeones";
+channels[2113]="S30.0W-49-6-141";
+channelsnames[2114]="C+LCampeon2";
+channels[2114]="S30.0W-49-6-142";
+channelsnames[2115]="C+LCampeon3";
+channels[2115]="S30.0W-49-6-143";
+channelsnames[2116]="MULTIDEP.6";
+channels[2116]="S30.0W-49-6-195";
+channelsnames[2117]="MULTIDEP.7";
+channels[2117]="S30.0W-49-6-196";
+channelsnames[2118]="PUBLIACTIVA";
+channels[2118]="S30.0W-49-6-347";
+channelsnames[2119]="TVCine 2";
+channels[2119]="S30.0W-54-42-700";
+channelsnames[2120]="Nickelodeon";
+channels[2120]="S30.0W-54-42-701";
+channelsnames[2121]="TVCine 3";
+channels[2121]="S30.0W-54-42-706";
+channelsnames[2122]="TVCine 1";
+channels[2122]="S30.0W-54-42-707";
+channelsnames[2123]="TVCine 4";
+channels[2123]="S30.0W-54-42-709";
+channelsnames[2124]="MOV";
+channels[2124]="S30.0W-54-42-711";
+channelsnames[2125]="TVE Internacional";
+channels[2125]="S30.0W-54-42-713";
+channelsnames[2126]="National Geographic";
+channels[2126]="S30.0W-54-42-714";
+channelsnames[2127]="TV Globo Portugal";
+channels[2127]="S30.0W-54-42-904";
+channelsnames[2128]="RTP Madeira";
+channels[2128]="S30.0W-54-42-935";
+channelsnames[2129]="Canal de Teste";
+channels[2129]="S30.0W-54-36-1";
+channelsnames[2130]="RTP Informação";
+channels[2130]="S30.0W-54-36-101";
+channelsnames[2131]="Panda Biggs";
+channels[2131]="S30.0W-54-36-102";
+channelsnames[2132]="Canal de Teste";
+channels[2132]="S30.0W-54-36-111";
+channelsnames[2133]="Canal Panda";
+channels[2133]="S30.0W-54-36-708";
+channelsnames[2134]="SIC Notícias";
+channels[2134]="S30.0W-54-36-801";
+channelsnames[2135]="RTP 1";
+channels[2135]="S30.0W-54-36-811";
+channelsnames[2136]="RTP 2";
+channels[2136]="S30.0W-54-36-812";
+channelsnames[2137]="TVI";
+channels[2137]="S30.0W-54-36-814";
+channelsnames[2138]="Sport TV Golfe";
+channels[2138]="S30.0W-54-37-219";
+channelsnames[2139]="Eurosport News";
+channels[2139]="S30.0W-54-37-227";
+channelsnames[2140]="TVE 24h";
+channels[2140]="S30.0W-54-37-228";
+channelsnames[2141]="EuroNews";
+channels[2141]="S30.0W-54-37-702";
+channelsnames[2142]="SIC Mulher";
+channels[2142]="S30.0W-54-37-703";
+channelsnames[2143]="TLC";
+channels[2143]="S30.0W-54-37-704";
+channelsnames[2144]="France 24";
+channels[2144]="S30.0W-54-37-720";
+channelsnames[2145]="Hot";
+channels[2145]="S30.0W-54-37-831";
+channelsnames[2146]="SLIDE TSCS2";
+channels[2146]="S30.0W-54-37-961";
+channelsnames[2147]="CNN";
+channels[2147]="S30.0W-54-37-962";
+channelsnames[2148]="Mezzo";
+channels[2148]="S30.0W-54-37-965";
+channelsnames[2149]="SKY News";
+channels[2149]="S30.0W-54-37-966";
+channelsnames[2150]="MEZZO";
+channels[2150]="S30.0W-54-37-2000";
+channelsnames[2151]="BBC WORLD";
+channels[2151]="S30.0W-54-37-2001";
+channelsnames[2152]="CNN INT";
+channels[2152]="S30.0W-54-37-2002";
+channelsnames[2153]="CNBC";
+channels[2153]="S30.0W-54-37-2005";
+channelsnames[2154]="EURONEWS";
+channels[2154]="S30.0W-54-37-2006";
+channelsnames[2155]="FRANCE 24 ENG";
+channels[2155]="S30.0W-54-37-2007";
+channelsnames[2156]="NG_DVR_5.4";
+channels[2156]="S30.0W-54-38-19";
+channelsnames[2157]="NG_Zapper_3.8";
+channels[2157]="S30.0W-54-38-20";
+channelsnames[2158]="NG_DVR_3.8";
+channels[2158]="S30.0W-54-38-21";
+channelsnames[2159]="NG_ZAPPER_5.8";
+channels[2159]="S30.0W-54-38-22";
+channelsnames[2160]="NG_DVR_5.8";
+channels[2160]="S30.0W-54-38-23";
+channelsnames[2161]="Playboy TV";
+channels[2161]="S30.0W-54-38-169";
+channelsnames[2162]="Sport TV 2";
+channels[2162]="S30.0W-54-38-301";
+channelsnames[2163]="Canal de teste";
+channels[2163]="S30.0W-54-38-302";
+channelsnames[2164]="AR TV";
+channels[2164]="S30.0W-54-38-303";
+channelsnames[2165]="Globo";
+channels[2165]="S30.0W-54-38-304";
+channelsnames[2166]="TVI 24";
+channels[2166]="S30.0W-54-38-305";
+channelsnames[2167]="Sport TV 3";
+channels[2167]="S30.0W-54-38-306";
+channelsnames[2168]="TV Record";
+channels[2168]="S30.0W-54-38-308";
+channelsnames[2169]="Sport TV Live";
+channels[2169]="S30.0W-54-38-309";
+channelsnames[2170]="RTP Memória";
+channels[2170]="S30.0W-54-38-310";
+channelsnames[2171]="Eurosport";
+channels[2171]="S30.0W-54-38-312";
+channelsnames[2172]="Hollywood";
+channels[2172]="S30.0W-54-38-313";
+channelsnames[2173]="MOV";
+channels[2173]="S30.0W-54-38-314";
+channelsnames[2174]="Canal de Teste";
+channels[2174]="S30.0W-54-38-701";
+channelsnames[2175]="SIC Radical";
+channels[2175]="S30.0W-54-40-502";
+channelsnames[2176]="Panda Biggs";
+channels[2176]="S30.0W-54-40-503";
+channelsnames[2177]="BBC Entertainment";
+channels[2177]="S30.0W-54-40-506";
+channelsnames[2178]="E! Entertainment";
+channels[2178]="S30.0W-54-40-507";
+channelsnames[2179]="Baby First";
+channels[2179]="S30.0W-54-40-509";
+channelsnames[2180]="Caça e Pesca";
+channels[2180]="S30.0W-54-40-933";
+channelsnames[2181]="Disney Junior";
+channels[2181]="S30.0W-54-40-939";
+channelsnames[2182]="CBS Reality";
+channels[2182]="S30.0W-54-41-604";
+channelsnames[2183]="RTP Açores";
+channels[2183]="S30.0W-54-41-605";
+channelsnames[2184]="NBA TV";
+channels[2184]="S30.0W-54-41-609";
+channelsnames[2185]="Canção Nova";
+channels[2185]="S30.0W-54-41-610";
+channelsnames[2186]="Novo SD TSCS6- 01";
+channels[2186]="S30.0W-54-41-611";
+channelsnames[2187]="Cartoon / TCM";
+channels[2187]="S30.0W-54-41-613";
+channelsnames[2188]="Canal Q";
+channels[2188]="S30.0W-54-41-959";
+channelsnames[2189]="C+ YOMVI";
+channels[2189]="S30.0W-49-9-7";
+channelsnames[2190]="COSMOPOLITAN";
+channels[2190]="S30.0W-49-9-26";
+channelsnames[2191]="HISTORIA";
+channels[2191]="S30.0W-49-9-35";
+channelsnames[2192]="BIO";
+channels[2192]="S30.0W-49-9-36";
+channelsnames[2193]="CINEMAGIC";
+channels[2193]="S30.0W-49-9-44";
+channelsnames[2194]="DCINEESPAÑOL";
+channels[2194]="S30.0W-49-9-48";
+channelsnames[2195]="EUROSPORT";
+channels[2195]="S30.0W-49-9-60";
+channelsnames[2196]="CAZA Y PESCA";
+channels[2196]="S30.0W-49-9-66";
+channelsnames[2197]="DISNEY XD";
+channels[2197]="S30.0W-49-9-72";
+channelsnames[2198]="CINEMAGIC";
+channels[2198]="S30.0W-49-9-73";
+channelsnames[2199]="24 HORAS";
+channels[2199]="S30.0W-49-9-100";
+channelsnames[2200]="BLOOMBERG";
+channels[2200]="S30.0W-49-9-102";
+channelsnames[2201]="Eventos";
+channels[2201]="S30.0W-49-9-500";
+channelsnames[2202]="Caça e Pesca";
+channels[2202]="S30.0W-49-9-3000";
+channelsnames[2203]="Eurosport";
+channels[2203]="S30.0W-49-9-3002";
+channelsnames[2204]="Canal de História";
+channels[2204]="S30.0W-49-9-3003";
+channelsnames[2205]="Bloomberg";
+channels[2205]="S30.0W-49-9-3004";
+channelsnames[2206]="TVE 24h";
+channels[2206]="S30.0W-49-9-3006";
+channelsnames[2207]="MTV ESPAÑA";
+channels[2207]="S30.0W-49-5-29";
+channelsnames[2208]="LTC";
+channels[2208]="S30.0W-49-5-39";
+channelsnames[2209]="BARÇA TV";
+channels[2209]="S30.0W-49-5-63";
+channelsnames[2210]="MOTORS TV";
+channels[2210]="S30.0W-49-5-65";
+channelsnames[2211]="DIVINITY";
+channels[2211]="S30.0W-49-5-90";
+channelsnames[2212]="ENERGY";
+channels[2212]="S30.0W-49-5-91";
+channelsnames[2213]="FOX NEWS";
+channels[2213]="S30.0W-49-5-105";
+channelsnames[2214]="C.ESTRELLAS";
+channels[2214]="S30.0W-49-5-117";
+channelsnames[2215]="C+ MultiCINE";
+channels[2215]="S30.0W-49-8-6";
+channelsnames[2216]="C+ MultiCINE";
+channels[2216]="S30.0W-49-8-40";
+channelsnames[2217]="C+ MultiDEP";
+channels[2217]="S30.0W-49-8-50";
+channelsnames[2218]="NICKELODEON";
+channels[2218]="S30.0W-49-8-74";
+channelsnames[2219]="TAQUILLA 1";
+channels[2219]="S30.0W-49-8-121";
+channelsnames[2220]="TAQUILLA 2";
+channels[2220]="S30.0W-49-8-122";
+channelsnames[2221]="TAQUILLA 3";
+channels[2221]="S30.0W-49-8-123";
+channelsnames[2222]="TAQUILLA 4";
+channels[2222]="S30.0W-49-8-124";
+channelsnames[2223]="TAQUILLA X";
+channels[2223]="S30.0W-49-8-139";
+channelsnames[2224]="MULTIDEP.4";
+channels[2224]="S30.0W-49-8-193";
channelsnames[3000]="TV3 Lithuania";
channels[3000]="S5.0E-85-14-6340";
channelsnames[3001]="TV6 Lithuania";
@@ -1902,7 +1880,7 @@ channelsnames[3009]="Lietuvos Rytas TV";
channels[3009]="S5.0E-85-52-2920";
channelsnames[3010]="BTV";
channels[3010]="S5.0E-85-52-2930";
-channelsnames[3011]="RTR Planeta";
+channelsnames[3011]="TV 2 Sportskanalen";
channels[3011]="S5.0E-86-24-4420";
channelsnames[3012]="NTV Mir Lithuania";
channels[3012]="S5.0E-85-13-6270";
@@ -2032,7 +2010,7 @@ channelsnames[3205]="TV2 Charlie";
channels[3205]="S5.0E-86-30-1820";
channelsnames[3206]="TV3 SPORT 1";
channels[3206]="S5.0E-86-30-1830";
-channelsnames[3207]="TV 2 Sportkanalen";
+channelsnames[3207]="TV2 Sport";
channels[3207]="S5.0E-86-30-1840";
channelsnames[3208]="TV2 Fri";
channels[3208]="S5.0E-86-30-1850";
@@ -2436,31 +2414,31 @@ channelsnames[3511]="EURO D";
channels[3511]="S42.0E-66-3-1309";
channelsnames[3512]="TV 8 INT";
channels[3512]="S42.0E-66-3-1318";
-channelsnames[3513]="MARKAFONİ";
+channelsnames[3513]="AYAZ TV";
channels[3513]="S42.0E-66-3-1321";
-channelsnames[3514]="BULUT TV";
+channelsnames[3514]="DUMAN TV";
channels[3514]="S42.0E-66-3-1323";
-channelsnames[3515]="SUPERPOP TV";
+channelsnames[3515]="SAHNE TV";
channels[3515]="S42.0E-66-3-1325";
-channelsnames[3516]="KARIŞIK TV";
+channelsnames[3516]="POPULER TV";
channels[3516]="S42.0E-66-3-1327";
-channelsnames[3517]="PİKSEL TV";
+channelsnames[3517]="R MUSIC TV";
channels[3517]="S42.0E-66-3-1329";
-channelsnames[3518]="KEVSER TV";
+channelsnames[3518]="RÜYAM TV";
channels[3518]="S42.0E-66-3-1331";
-channelsnames[3519]="PMC TV";
+channelsnames[3519]="PLS TV";
channels[3519]="S42.0E-66-3-1333";
-channelsnames[3520]="MÜZİK TÜRK";
+channelsnames[3520]="KRM TV";
channels[3520]="S42.0E-66-3-1335";
-channelsnames[3521]="HAZAN TV";
+channelsnames[3521]="HZN TV";
channels[3521]="S42.0E-66-3-1337";
channelsnames[3522]="NİSA TV";
channels[3522]="S42.0E-66-3-1339";
channelsnames[3523]="DOĞU TV";
channels[3523]="S42.0E-66-3-1341";
-channelsnames[3524]="TURKU TV";
+channelsnames[3524]="CANO TV";
channels[3524]="S42.0E-66-3-1343";
-channelsnames[3525]="DOLU TV";
+channelsnames[3525]="FESTİVAL TV";
channels[3525]="S42.0E-66-3-1345";
channelsnames[3526]="KIRMIZI GÜL";
channels[3526]="S42.0E-66-3-1351";
@@ -2658,16 +2636,14 @@ channelsnames[4015]="TVP INFO";
channels[4015]="S13.0E-318-1500-5110";
channelsnames[4016]="TVP Kultura";
channels[4016]="S13.0E-318-1500-5113";
-channelsnames[4017]="TV POLONIA";
-channels[4017]="S13.0E-318-1500-5101";
-channelsnames[4018]="TVP Historia";
-channels[4018]="S13.0E-318-11600-3524";
-channelsnames[4019]="TVP Rozrywka";
-channels[4019]="S13.0E-318-11200-17032";
-channelsnames[4020]="TV PULS";
-channels[4020]="S13.0E-318-1500-5112";
-channelsnames[4021]="Superstacja";
-channels[4021]="S13.0E-113-7900-10521";
+channelsnames[4017]="TVP Historia";
+channels[4017]="S13.0E-318-11600-3524";
+channelsnames[4018]="TVP Rozrywka";
+channels[4018]="S13.0E-318-11200-17032";
+channelsnames[4019]="TV PULS";
+channels[4019]="S13.0E-318-1500-5112";
+channelsnames[4020]="Superstacja";
+channels[4020]="S13.0E-113-7900-10521";
channelsnames[4022]="TVN 24 Biznes i Swiat";
channels[4022]="S13.0E-318-1000-4322";
channelsnames[4023]="TVN Meteo";
@@ -2680,7 +2656,7 @@ channelsnames[4026]="Polsat News";
channels[4026]="S13.0E-113-13200-13129";
channelsnames[4027]="BBC HD";
channels[4027]="S13.0E-318-11600-3590";
-channelsnames[4028]="BBC Entertainment Poland";
+channelsnames[4028]="BBC BRIT";
channels[4028]="S13.0E-318-13000-14602";
channelsnames[4029]="TVN 24";
channels[4029]="S13.0E-318-1000-4312";
@@ -2710,7 +2686,7 @@ channelsnames[4053]="Ale kino+ HD";
channels[4053]="S13.0E-318-1100-14239";
channelsnames[4054]="FOX HD";
channels[4054]="S13.0E-113-7800-3111";
-channelsnames[4055]="FoxLife HD";
+channelsnames[4055]="Fox Comedy HD";
channels[4055]="S13.0E-113-7800-3103";
channelsnames[4056]="AXN HD";
channels[4056]="S13.0E-113-7800-3109";
@@ -2722,8 +2698,12 @@ channelsnames[4059]="Romance TV";
channels[4059]="S13.0E-318-1300-15038";
channelsnames[4060]="Sundance HD";
channels[4060]="S13.0E-318-12000-15901";
-channelsnames[4145]="4fun.TV";
-channels[4145]="S13.0E-318-11000-4404";
+channelsnames[4145]="4FUN TV";
+channels[4145]="S13.0E-318-500-2205";
+channelsnames[4146]="TV Disco";
+channels[4146]="S13.0E-318-500-2204";
+channelsnames[4147]="Mjuzik TV";
+channels[4147]="S13.0E-318-500-2203";
channelsnames[4165]="FILMBOX HD";
channels[4165]="S13.0E-318-400-13025";
channelsnames[4166]="Filmbox Extra";
@@ -2742,7 +2722,7 @@ channelsnames[4212]="TVP 2";
channels[4212]="S13.0E-318-11900-4808";
channelsnames[4213]="TV PULS";
channels[4213]="S13.0E-318-1500-5142";
-channelsnames[4272]="FoxLife";
+channelsnames[4272]="Fox Comedy";
channels[4272]="S13.0E-113-7400-7375";
channelsnames[4500]="CANAL+ FAMILY";
channels[4500]="S13.0E-318-11000-4414";
@@ -2904,7 +2884,7 @@ channelsnames[4670]="5108";
channels[4670]="S13.0E-318-1500-5108";
channelsnames[4671]="TVP Regionalna";
channels[4671]="S13.0E-318-1500-5115";
-channelsnames[4672]="ANIMAL PLANET";
+channelsnames[4672]="DISCOVERY LIFE";
channels[4672]="S13.0E-318-1500-5122";
channelsnames[4673]="CBS Drama";
channels[4673]="S13.0E-318-1500-5126";
@@ -2950,276 +2930,292 @@ channelsnames[4693]="Discovery Turbo Xtra";
channels[4693]="S13.0E-318-11400-15703";
channelsnames[4694]="TVP SPORT";
channels[4694]="S13.0E-318-11400-15704";
-channelsnames[4695]="TELE5";
-channels[4695]="S13.0E-318-11400-15705";
-channelsnames[4696]="POLONIA1";
-channels[4696]="S13.0E-318-11400-15706";
-channelsnames[4697]="CINEMAX 2";
-channels[4697]="S13.0E-318-11400-15707";
-channelsnames[4698]="NATIONAL GEO";
-channels[4698]="S13.0E-318-11400-15710";
-channelsnames[4699]="Orange Sport";
-channels[4699]="S13.0E-318-11400-15711";
-channelsnames[4700]="POLSAT VOLLEYBALL 4";
-channels[4700]="S13.0E-318-11400-15716";
-channelsnames[4701]="TVP Seriale";
-channels[4701]="S13.0E-318-11400-15728";
-channelsnames[4702]="MTV Polska";
-channels[4702]="S13.0E-318-12800-2";
-channelsnames[4703]="CC Family";
-channels[4703]="S13.0E-318-12800-4";
-channelsnames[4704]="VIVA Polska";
-channels[4704]="S13.0E-318-12800-5";
-channelsnames[4705]="Viacom Blink!";
-channels[4705]="S13.0E-318-12800-6";
-channelsnames[4706]="VH1";
-channels[4706]="S13.0E-318-12800-7";
-channelsnames[4707]="Comedy Central Polska";
-channels[4707]="S13.0E-318-12800-10";
-channelsnames[4708]="Nickelodeon";
-channels[4708]="S13.0E-318-12800-11";
-channelsnames[4709]="MTV Live HD";
-channels[4709]="S13.0E-318-12800-21";
-channelsnames[4710]="MTV Polska.";
-channels[4710]="S13.0E-318-12800-22";
-channelsnames[4711]="CC Family.";
-channels[4711]="S13.0E-318-12800-24";
-channelsnames[4712]="VIVA Polska.";
-channels[4712]="S13.0E-318-12800-25";
-channelsnames[4713]="Comedy Central Polska.";
-channels[4713]="S13.0E-318-12800-30";
-channelsnames[4714]="VIVA Polska..";
-channels[4714]="S13.0E-318-12800-45";
-channelsnames[4715]="Starz TV";
-channels[4715]="S28.2E-2-2314-53335";
-channelsnames[4716]="?TV";
-channels[4716]="S28.2E-2-2314-53361";
-channelsnames[4717]="True Ent+1";
-channels[4717]="S28.2E-2-2314-53371";
-channelsnames[4718]="BBC Knowledge Poland";
-channels[4718]="S13.0E-318-13000-14603";
-channelsnames[4719]="BBC Lifestyle Poland";
-channels[4719]="S13.0E-318-13000-14604";
-channelsnames[4720]="BBC CBeebies Poland";
-channels[4720]="S13.0E-318-13000-14605";
-channelsnames[4721]="Discovery ID Poland";
-channels[4721]="S13.0E-318-13000-14612";
-channelsnames[4722]="TLC Poland";
-channels[4722]="S13.0E-318-13000-14613";
-channelsnames[4723]="Loveworld";
-channels[4723]="S13.0E-318-13000-14606";
-channelsnames[4724]="BBC Arabic TV";
-channels[4724]="S13.0E-318-13000-14616";
-channelsnames[4725]="BBC Arabic Radio";
-channels[4725]="S13.0E-318-13000-14617";
-channelsnames[4726]="BBC English (Europe)";
-channels[4726]="S13.0E-318-13000-14618";
-channelsnames[4727]="BBC English Mid-East";
-channels[4727]="S13.0E-318-13000-14619";
-channelsnames[4728]="Test4";
-channels[4728]="S13.0E-113-7900-10500";
-channelsnames[4729]="Polsat Food";
-channels[4729]="S13.0E-113-7900-10501";
-channelsnames[4730]="Boomerang";
-channels[4730]="S13.0E-113-7900-10502";
-channelsnames[4731]="Radio ZET Gold";
-channels[4731]="S13.0E-113-7900-10503";
-channelsnames[4732]="Radio ZET Gold";
-channels[4732]="S13.0E-113-7900-10504";
-channelsnames[4733]="MTV Rocks";
-channels[4733]="S13.0E-113-7900-10505";
-channelsnames[4734]="CBS Europa";
-channels[4734]="S13.0E-113-7900-10507";
-channelsnames[4735]="Polsat Jim Jam";
-channels[4735]="S13.0E-113-7900-10508";
-channelsnames[4736]="ATM Rozrywka TV";
-channels[4736]="S13.0E-113-7900-10511";
-channelsnames[4737]="Polsat Sport News";
-channels[4737]="S13.0E-113-7900-10514";
-channelsnames[4738]="Blue Hustler";
-channels[4738]="S13.0E-113-7900-10516";
+channelsnames[4695]="CINEMAX 2";
+channels[4695]="S13.0E-318-11400-15707";
+channelsnames[4696]="NATIONAL GEO";
+channels[4696]="S13.0E-318-11400-15710";
+channelsnames[4697]="Orange Sport";
+channels[4697]="S13.0E-318-11400-15711";
+channelsnames[4698]="TVP Seriale";
+channels[4698]="S13.0E-318-11400-15728";
+channelsnames[4699]="MTV Polska";
+channels[4699]="S13.0E-318-12800-2";
+channelsnames[4700]="CC Family";
+channels[4700]="S13.0E-318-12800-4";
+channelsnames[4701]="VIVA Polska";
+channels[4701]="S13.0E-318-12800-5";
+channelsnames[4702]="Viacom Blink!";
+channels[4702]="S13.0E-318-12800-6";
+channelsnames[4703]="VH1";
+channels[4703]="S13.0E-318-12800-7";
+channelsnames[4704]="Comedy Central Polska";
+channels[4704]="S13.0E-318-12800-10";
+channelsnames[4705]="Nickelodeon";
+channels[4705]="S13.0E-318-12800-11";
+channelsnames[4706]="MTV Live HD";
+channels[4706]="S13.0E-318-12800-21";
+channelsnames[4707]="MTV Polska.";
+channels[4707]="S13.0E-318-12800-22";
+channelsnames[4708]="CC Family.";
+channels[4708]="S13.0E-318-12800-24";
+channelsnames[4709]="VIVA Polska.";
+channels[4709]="S13.0E-318-12800-25";
+channelsnames[4710]="Comedy Central Polska.";
+channels[4710]="S13.0E-318-12800-30";
+channelsnames[4711]="VIVA Polska..";
+channels[4711]="S13.0E-318-12800-45";
+channelsnames[4712]="Starz TV";
+channels[4712]="S28.2E-2-2314-53335";
+channelsnames[4713]="?TV";
+channels[4713]="S28.2E-2-2314-53361";
+channelsnames[4714]="True Ent+1";
+channels[4714]="S28.2E-2-2314-53371";
+channelsnames[4715]="BBC earth";
+channels[4715]="S13.0E-318-13000-14603";
+channelsnames[4716]="BBC Lifestyle";
+channels[4716]="S13.0E-318-13000-14604";
+channelsnames[4717]="BBC CBeebies";
+channels[4717]="S13.0E-318-13000-14605";
+channelsnames[4718]="Discovery ID Poland";
+channels[4718]="S13.0E-318-13000-14612";
+channelsnames[4719]="TLC Poland";
+channels[4719]="S13.0E-318-13000-14613";
+channelsnames[4720]="Loveworld";
+channels[4720]="S13.0E-318-13000-14606";
+channelsnames[4721]="BBC Arabic TV";
+channels[4721]="S13.0E-318-13000-14616";
+channelsnames[4722]="BBC Arabic Radio";
+channels[4722]="S13.0E-318-13000-14617";
+channelsnames[4723]="BBC English (Europe)";
+channels[4723]="S13.0E-318-13000-14618";
+channelsnames[4724]="BBC English Mid-East";
+channels[4724]="S13.0E-318-13000-14619";
+channelsnames[4725]="Test4";
+channels[4725]="S13.0E-113-7900-10500";
+channelsnames[4726]="Polsat Food";
+channels[4726]="S13.0E-113-7900-10501";
+channelsnames[4727]="Boomerang";
+channels[4727]="S13.0E-113-7900-10502";
+channelsnames[4728]="Radio ZET Gold";
+channels[4728]="S13.0E-113-7900-10503";
+channelsnames[4729]="Radio ZET Gold";
+channels[4729]="S13.0E-113-7900-10504";
+channelsnames[4730]="MTV Rocks";
+channels[4730]="S13.0E-113-7900-10505";
+channelsnames[4731]="CBS Europa";
+channels[4731]="S13.0E-113-7900-10507";
+channelsnames[4732]="Polsat Jim Jam";
+channels[4732]="S13.0E-113-7900-10508";
+channelsnames[4733]="ATM Rozrywka TV";
+channels[4733]="S13.0E-113-7900-10511";
+channelsnames[4734]="Polsat Sport News";
+channels[4734]="S13.0E-113-7900-10514";
+channelsnames[4735]="Blue Hustler";
+channels[4735]="S13.0E-113-7900-10516";
+channelsnames[4736]="Zlote Przeboje";
+channels[4736]="S13.0E-113-7900-10519";
+channelsnames[4737]="Travel";
+channels[4737]="S13.0E-113-7900-10520";
+channelsnames[4738]="RMF FM";
+channels[4738]="S13.0E-113-7900-10523";
channelsnames[4739]="Zlote Przeboje";
-channels[4739]="S13.0E-113-7900-10519";
-channelsnames[4740]="Travel";
-channels[4740]="S13.0E-113-7900-10520";
-channelsnames[4741]="RMF FM";
-channels[4741]="S13.0E-113-7900-10523";
-channelsnames[4742]="Zlote Przeboje";
-channels[4742]="S13.0E-113-7900-10524";
-channelsnames[4743]="RMF Classic";
-channels[4743]="S13.0E-113-7900-10526";
-channelsnames[4744]="Muzo.fm";
-channels[4744]="S13.0E-113-7900-10527";
-channelsnames[4745]="Jedynka - PR";
-channels[4745]="S13.0E-113-7900-10528";
-channelsnames[4746]="Trójka - PR";
-channels[4746]="S13.0E-113-7900-10529";
-channelsnames[4747]="Radio ZET";
-channels[4747]="S13.0E-113-7900-10530";
-channelsnames[4748]="Radio ZET";
-channels[4748]="S13.0E-113-7900-10531";
-channelsnames[4749]="RMF Classic";
-channels[4749]="S13.0E-113-7900-10532";
-channelsnames[4750]="Trójka - PR";
-channels[4750]="S13.0E-113-7900-10535";
-channelsnames[4751]="Muzo.fm";
-channels[4751]="S13.0E-113-7900-10536";
-channelsnames[4752]="Jedynka - PR";
-channels[4752]="S13.0E-113-7900-10537";
-channelsnames[4753]="RMF FM";
-channels[4753]="S13.0E-113-7900-10538";
-channelsnames[4754]="RMF MAXXX";
-channels[4754]="S13.0E-113-7900-10543";
-channelsnames[4755]="RMF MAXXX";
-channels[4755]="S13.0E-113-7900-10549";
-channelsnames[4756]="Disney Junior";
-channels[4756]="S13.0E-113-7900-10552";
-channelsnames[4757]="Dla Abonentow";
-channels[4757]="S13.0E-113-7900-10556";
-channelsnames[4758]="CN/TCM";
-channels[4758]="S13.0E-318-12200-7457";
-channelsnames[4759]="Noursat";
-channels[4759]="S13.0E-318-12200-7402";
-channelsnames[4760]="Al Hiwar";
-channels[4760]="S13.0E-318-12200-7456";
-channelsnames[4761]="DMC";
-channels[4761]="S13.0E-318-12200-7459";
-channelsnames[4762]="Miracle TV";
-channels[4762]="S13.0E-318-12200-7460";
-channelsnames[4763]="Al Forat";
-channels[4763]="S13.0E-318-12200-7463";
-channelsnames[4764]="Al Fady";
-channels[4764]="S13.0E-318-12200-7464";
-channelsnames[4765]="Disney Channel";
-channels[4765]="S13.0E-318-12200-7466";
-channelsnames[4766]="Cartoon Network";
-channels[4766]="S13.0E-318-12200-7467";
-channelsnames[4767]="Turner Classic Movies";
-channels[4767]="S13.0E-318-12200-7468";
-channelsnames[4768]="RFI Persian";
-channels[4768]="S13.0E-318-12200-7469";
-channelsnames[4769]="Sat 7 Pars";
-channels[4769]="S13.0E-318-12200-7470";
-channelsnames[4770]="Velayat TV";
-channels[4770]="S13.0E-318-12200-7471";
-channelsnames[4771]="Karbala Satellite Channel";
-channels[4771]="S13.0E-318-12200-7472";
-channelsnames[4772]="iTV";
-channels[4772]="S13.0E-318-12200-7473";
-channelsnames[4773]="Al Maaref";
-channels[4773]="S13.0E-318-12200-7474";
-channelsnames[4774]="STS International";
-channels[4774]="S13.0E-318-12200-7475";
-channelsnames[4775]="Ahl E Bait";
-channels[4775]="S13.0E-318-12200-7476";
-channelsnames[4776]="Cancao Nova";
-channels[4776]="S13.0E-318-200-4922";
-channelsnames[4777]="ESP2 Dutch";
-channels[4777]="S13.0E-318-200-13802";
-channelsnames[4778]="ESP2 Test";
-channels[4778]="S13.0E-318-200-13804";
-channelsnames[4779]="ESP2 Greek";
-channels[4779]="S13.0E-318-200-13805";
-channelsnames[4780]="ESP2 Portuguese";
-channels[4780]="S13.0E-318-200-13821";
-channelsnames[4781]="ESP2 Italy";
-channels[4781]="S13.0E-318-200-13822";
-channelsnames[4782]="ESP2 Biava";
-channels[4782]="S13.0E-318-200-13823";
-channelsnames[4783]="ESP Spain";
-channels[4783]="S13.0E-318-200-13829";
-channelsnames[4784]="ESP Italy";
-channels[4784]="S13.0E-318-200-13830";
-channelsnames[4785]="ESP Polish";
-channels[4785]="S13.0E-318-200-13834";
-channelsnames[4786]="ESP Portuguese";
-channels[4786]="S13.0E-318-200-13836";
-channelsnames[4787]="ESP Hungarian";
-channels[4787]="S13.0E-318-200-13837";
-channelsnames[4788]="ESP Czech";
-channels[4788]="S13.0E-318-200-13839";
-channelsnames[4789]="ESP Greek";
-channels[4789]="S13.0E-318-200-13840";
-channelsnames[4790]="ESP Cyprus";
-channels[4790]="S13.0E-318-200-13841";
-channelsnames[4791]="ESP Bulgarian";
-channels[4791]="S13.0E-318-200-13842";
-channelsnames[4792]="ESP2 Turk";
-channels[4792]="S13.0E-318-200-13843";
-channelsnames[4793]="ESP Serbia";
-channels[4793]="S13.0E-318-200-13844";
-channelsnames[4794]="ESP Turk";
-channels[4794]="S13.0E-318-200-13845";
-channelsnames[4795]="ESP2 German";
-channels[4795]="S13.0E-318-200-13846";
-channelsnames[4796]="ESP2 Serbia";
-channels[4796]="S13.0E-318-200-13847";
-channelsnames[4797]="ESP Biava";
-channels[4797]="S13.0E-318-200-13848";
-channelsnames[4798]="EUROSPORT2 PL";
-channels[4798]="S13.0E-318-200-13864";
-channelsnames[4799]="EUROSPORT PL";
-channels[4799]="S13.0E-318-200-13865";
-channelsnames[4800]="ESP2 NE Intl";
-channels[4800]="S13.0E-318-200-13877";
-channelsnames[4801]="ESP2 NE Polish";
-channels[4801]="S13.0E-318-200-13878";
-channelsnames[4802]="ESP2 NE Bulgarian";
-channels[4802]="S13.0E-318-200-13879";
-channelsnames[4803]="ESP2 NE Serbian";
-channels[4803]="S13.0E-318-200-13880";
-channelsnames[4804]="ESP2 NE Czech";
-channels[4804]="S13.0E-318-200-13881";
-channelsnames[4805]="ESP2 NE Danish";
-channels[4805]="S13.0E-318-200-13882";
-channelsnames[4806]="ESP2 NE Swedish";
-channels[4806]="S13.0E-318-200-13884";
-channelsnames[4807]="ESP ECH";
-channels[4807]="S13.0E-318-200-13885";
-channelsnames[4808]="ESP2 NE UPC";
-channels[4808]="S13.0E-318-200-13886";
-channelsnames[4809]="ESP2 NE Hungary";
-channels[4809]="S13.0E-318-200-13887";
-channelsnames[4810]="ESP2 NE Romania";
-channels[4810]="S13.0E-318-200-13888";
-channelsnames[4811]="ESP UPC";
-channels[4811]="S13.0E-318-200-13889";
-channelsnames[4812]="ESP2 NE Norwegian";
-channels[4812]="S13.0E-318-200-13890";
-channelsnames[4813]="ESP2 NE Dutch";
-channels[4813]="S13.0E-318-200-13891";
-channelsnames[4814]="ESP Romanian";
-channels[4814]="S13.0E-318-200-13892";
-channelsnames[4815]="A3";
-channels[4815]="S13.0E-318-200-13940";
-channelsnames[4816]="Canal Algerie";
-channels[4816]="S13.0E-318-200-13950";
-channelsnames[4817]="TV5MONDE FBS";
-channels[4817]="S13.0E-318-13100-7321";
-channelsnames[4818]="TV5MONDE EUROPE";
-channels[4818]="S13.0E-318-13100-7322";
-channelsnames[4819]="Crime and Investigation nc+";
-channels[4819]="S13.0E-318-13100-7324";
-channelsnames[4820]="Crime + Investigation";
-channels[4820]="S13.0E-318-13100-7325";
-channelsnames[4821]="GEM TV";
-channels[4821]="S13.0E-318-13100-7333";
-channelsnames[4822]="AB Channel";
-channels[4822]="S13.0E-318-13100-7334";
-channelsnames[4823]="Kurd Channel";
-channels[4823]="S13.0E-318-13100-7335";
-channelsnames[4824]="NUMBER 1";
-channels[4824]="S13.0E-318-13100-7337";
-channelsnames[4825]="Radio Expert";
-channels[4825]="S13.0E-318-13100-7339";
-channelsnames[4826]="Manoto 1";
-channels[4826]="S13.0E-318-13100-7355";
-channelsnames[5001]="RTL4 HD";
-channels[5001]="S23.5E-3-3208-7020-8";
-channelsnames[5002]="RTL5 HD";
-channels[5002]="S23.5E-3-3208-7023-8";
-channelsnames[5003]="SBS6 HD";
-channels[5003]="S23.5E-3-3202-6090-4";
+channels[4739]="S13.0E-113-7900-10524";
+channelsnames[4740]="RMF Classic";
+channels[4740]="S13.0E-113-7900-10526";
+channelsnames[4741]="Muzo.fm";
+channels[4741]="S13.0E-113-7900-10527";
+channelsnames[4742]="Jedynka - PR";
+channels[4742]="S13.0E-113-7900-10528";
+channelsnames[4743]="Trójka - PR";
+channels[4743]="S13.0E-113-7900-10529";
+channelsnames[4744]="Radio ZET";
+channels[4744]="S13.0E-113-7900-10530";
+channelsnames[4745]="Radio ZET";
+channels[4745]="S13.0E-113-7900-10531";
+channelsnames[4746]="RMF Classic";
+channels[4746]="S13.0E-113-7900-10532";
+channelsnames[4747]="Trójka - PR";
+channels[4747]="S13.0E-113-7900-10535";
+channelsnames[4748]="Muzo.fm";
+channels[4748]="S13.0E-113-7900-10536";
+channelsnames[4749]="Jedynka - PR";
+channels[4749]="S13.0E-113-7900-10537";
+channelsnames[4750]="RMF FM";
+channels[4750]="S13.0E-113-7900-10538";
+channelsnames[4751]="RMF MAXXX";
+channels[4751]="S13.0E-113-7900-10543";
+channelsnames[4752]="RMF MAXXX";
+channels[4752]="S13.0E-113-7900-10549";
+channelsnames[4753]="Disney Junior";
+channels[4753]="S13.0E-113-7900-10552";
+channelsnames[4754]="Dla Abonentow";
+channels[4754]="S13.0E-113-7900-10556";
+channelsnames[4755]="CN/TCM";
+channels[4755]="S13.0E-318-12200-7457";
+channelsnames[4756]="Noursat";
+channels[4756]="S13.0E-318-12200-7402";
+channelsnames[4757]="Al Hiwar";
+channels[4757]="S13.0E-318-12200-7456";
+channelsnames[4758]="DMC";
+channels[4758]="S13.0E-318-12200-7459";
+channelsnames[4759]="Miracle TV";
+channels[4759]="S13.0E-318-12200-7460";
+channelsnames[4760]="Al Forat";
+channels[4760]="S13.0E-318-12200-7463";
+channelsnames[4761]="Al Fady";
+channels[4761]="S13.0E-318-12200-7464";
+channelsnames[4762]="Disney Channel";
+channels[4762]="S13.0E-318-12200-7466";
+channelsnames[4763]="Cartoon Network";
+channels[4763]="S13.0E-318-12200-7467";
+channelsnames[4764]="Turner Classic Movies";
+channels[4764]="S13.0E-318-12200-7468";
+channelsnames[4765]="RFI Persian";
+channels[4765]="S13.0E-318-12200-7469";
+channelsnames[4766]="Sat 7 Pars";
+channels[4766]="S13.0E-318-12200-7470";
+channelsnames[4767]="Velayat TV";
+channels[4767]="S13.0E-318-12200-7471";
+channelsnames[4768]="Karbala Satellite Channel";
+channels[4768]="S13.0E-318-12200-7472";
+channelsnames[4769]="iTV";
+channels[4769]="S13.0E-318-12200-7473";
+channelsnames[4770]="Al Maaref";
+channels[4770]="S13.0E-318-12200-7474";
+channelsnames[4771]="Ahl E Bait";
+channels[4771]="S13.0E-318-12200-7476";
+channelsnames[4772]="Cancao Nova";
+channels[4772]="S13.0E-318-200-4922";
+channelsnames[4773]="ESP2 Dutch";
+channels[4773]="S13.0E-318-200-13802";
+channelsnames[4774]="ESP2 Test";
+channels[4774]="S13.0E-318-200-13804";
+channelsnames[4775]="ESP2 Greek";
+channels[4775]="S13.0E-318-200-13805";
+channelsnames[4776]="ESP2 Portuguese";
+channels[4776]="S13.0E-318-200-13821";
+channelsnames[4777]="ESP2 Italy";
+channels[4777]="S13.0E-318-200-13822";
+channelsnames[4778]="ESP2 Biava";
+channels[4778]="S13.0E-318-200-13823";
+channelsnames[4779]="ESP Spain";
+channels[4779]="S13.0E-318-200-13829";
+channelsnames[4780]="ESP Italy";
+channels[4780]="S13.0E-318-200-13830";
+channelsnames[4781]="ESP Polish";
+channels[4781]="S13.0E-318-200-13834";
+channelsnames[4782]="ESP Portuguese";
+channels[4782]="S13.0E-318-200-13836";
+channelsnames[4783]="ESP Hungarian";
+channels[4783]="S13.0E-318-200-13837";
+channelsnames[4784]="ESP Czech";
+channels[4784]="S13.0E-318-200-13839";
+channelsnames[4785]="ESP Greek";
+channels[4785]="S13.0E-318-200-13840";
+channelsnames[4786]="ESP Cyprus";
+channels[4786]="S13.0E-318-200-13841";
+channelsnames[4787]="ESP Bulgarian";
+channels[4787]="S13.0E-318-200-13842";
+channelsnames[4788]="ESP2 Turk";
+channels[4788]="S13.0E-318-200-13843";
+channelsnames[4789]="ESP Serbia";
+channels[4789]="S13.0E-318-200-13844";
+channelsnames[4790]="ESP Turk";
+channels[4790]="S13.0E-318-200-13845";
+channelsnames[4791]="ESP2 German";
+channels[4791]="S13.0E-318-200-13846";
+channelsnames[4792]="ESP2 Serbia";
+channels[4792]="S13.0E-318-200-13847";
+channelsnames[4793]="ESP Biava";
+channels[4793]="S13.0E-318-200-13848";
+channelsnames[4794]="EUROSPORT2 PL";
+channels[4794]="S13.0E-318-200-13864";
+channelsnames[4795]="EUROSPORT PL";
+channels[4795]="S13.0E-318-200-13865";
+channelsnames[4796]="ESP2 NE Intl";
+channels[4796]="S13.0E-318-200-13877";
+channelsnames[4797]="ESP2 NE Polish";
+channels[4797]="S13.0E-318-200-13878";
+channelsnames[4798]="ESP2 NE Bulgarian";
+channels[4798]="S13.0E-318-200-13879";
+channelsnames[4799]="ESP2 NE Serbian";
+channels[4799]="S13.0E-318-200-13880";
+channelsnames[4800]="ESP2 NE Czech";
+channels[4800]="S13.0E-318-200-13881";
+channelsnames[4801]="ESP2 NE Danish";
+channels[4801]="S13.0E-318-200-13882";
+channelsnames[4802]="ESP2 NE Swedish";
+channels[4802]="S13.0E-318-200-13884";
+channelsnames[4803]="ESP ECH";
+channels[4803]="S13.0E-318-200-13885";
+channelsnames[4804]="ESP2 NE UPC";
+channels[4804]="S13.0E-318-200-13886";
+channelsnames[4805]="ESP2 NE Hungary";
+channels[4805]="S13.0E-318-200-13887";
+channelsnames[4806]="ESP2 NE Romania";
+channels[4806]="S13.0E-318-200-13888";
+channelsnames[4807]="ESP UPC";
+channels[4807]="S13.0E-318-200-13889";
+channelsnames[4808]="ESP2 NE Norwegian";
+channels[4808]="S13.0E-318-200-13890";
+channelsnames[4809]="ESP2 NE Dutch";
+channels[4809]="S13.0E-318-200-13891";
+channelsnames[4810]="ESP Romanian";
+channels[4810]="S13.0E-318-200-13892";
+channelsnames[4811]="A3";
+channels[4811]="S13.0E-318-200-13940";
+channelsnames[4812]="Canal Algerie";
+channels[4812]="S13.0E-318-200-13950";
+channelsnames[4813]="TV5MONDE FBS";
+channels[4813]="S13.0E-318-13100-7321";
+channelsnames[4814]="TV5MONDE EUROPE";
+channels[4814]="S13.0E-318-13100-7322";
+channelsnames[4815]="Crime and Investigation nc+";
+channels[4815]="S13.0E-318-13100-7324";
+channelsnames[4816]="Crime + Investigation";
+channels[4816]="S13.0E-318-13100-7325";
+channelsnames[4817]="GEM TV";
+channels[4817]="S13.0E-318-13100-7333";
+channelsnames[4818]="Kurd Channel";
+channels[4818]="S13.0E-318-13100-7335";
+channelsnames[4819]="NUMBER 1";
+channels[4819]="S13.0E-318-13100-7337";
+channelsnames[4820]="Manoto 1";
+channels[4820]="S13.0E-318-13100-7355";
+channelsnames[5001]="Cinema 1";
+channels[5001]="S13.0E-64511-6600-11101";
+channelsnames[5002]="AXN Sci-Fi";
+channels[5002]="S13.0E-64511-6600-11104";
+channelsnames[5003]="Cinema Family";
+channels[5003]="S13.0E-64511-6600-11105";
+channelsnames[5004]="Cinema +24";
+channels[5004]="S13.0E-64511-6600-11107";
+channelsnames[5005]="Cinema Classics";
+channels[5005]="S13.0E-64511-6600-11109";
+channelsnames[5006]="Disney Ch. +2";
+channels[5006]="S13.0E-64511-6600-11114";
+channelsnames[5007]="Cinema Max";
+channels[5007]="S13.0E-64511-6600-11115";
+channelsnames[5008]="Disney Channel";
+channels[5008]="S13.0E-64511-6600-11118";
+channelsnames[5009]="Discovery";
+channels[5009]="S13.0E-64511-6600-11121";
+channelsnames[5010]="Cinema Passion";
+channels[5010]="S13.0E-64511-6600-11123";
+channelsnames[5011]="Disney Junior";
+channels[5011]="S13.0E-64511-6600-11132";
+channelsnames[5012]="AXN +1";
+channels[5012]="S13.0E-64511-6600-11171";
+channelsnames[5013]="Cinema Max +1";
+channels[5013]="S13.0E-64511-6700-11715";
+channelsnames[5014]="Cinema +1";
+channels[5014]="S13.0E-64511-6700-11722";
+channelsnames[5015]="Cinema Hits";
+channels[5015]="S13.0E-64511-6700-11724";
+channelsnames[5016]="Cinema Comedy";
+channels[5016]="S13.0E-64511-6700-11725";
+channelsnames[5017]="Mosaico Cinema";
+channels[5017]="S13.0E-64511-6700-11728";
channelsnames[5100]="BBC Olym 4 HD";
channels[5100]="S28.2E-0-0-8900";
channelsnames[6001]="Meiden van Holland Hard";
@@ -3255,7 +3251,7 @@ channels[6015]="S13.0E-318-13300-4960";
channelsnames[6016]="FL TV";
channels[6016]="S13.0E-318-15400-13512";
channelsnames[6017]="Venus";
-channels[6017]="S30.0W-83-105-502-4";
+channels[6017]="S30.0W-83-105-502";
channelsnames[6018]="Leo TV";
channels[6018]="S23.5E-3-3219-13142";
channelsnames[6019]="Vivid";
@@ -3279,9 +3275,9 @@ channels[6027]="S13.0E-318-5000-10";
channelsnames[6028]="Redlight 3D-HD";
channels[6028]="S13.0E-318-15800-16932";
channelsnames[6029]="Penthouse 3D";
-channels[6029]="S23.5E-3-3204-5311-12";
+channels[6029]="S23.5E-3-3204-5311";
channelsnames[6030]="EROXXX";
-channels[6030]="S23.5E-3-3212-14055-12";
+channels[6030]="S23.5E-3-3212-14055";
channelsnames[6031]="Brazzers.tv";
channels[6031]="S23.5E-3-3202-6072";
channelsnames[6032]="Hustler HD-3D";
@@ -3314,7 +3310,7 @@ channelsnames[6045]="Penthouse HD1";
channels[6045]="S23.5E-3-3236-5712";
channelsnames[6046]="Penthouse HD2";
channels[6046]="S23.5E-3-3236-5713";
-channelsnames[6047]="Hallo TV German free";
+channelsnames[6047]="Service 13015";
channels[6047]="S19.2E-1-1117-13015";
channelsnames[8001]="NPO 1";
channels[8001]="T-8720-2214-1101";
@@ -3508,7 +3504,7 @@ channelsnames[9053]="Radio Beat";
channels[9053]="S23.5E-3-3209-13120";
channelsnames[9054]="1LIVE";
channels[9054]="S19.2E-1-1093-28475";
-channelsnames[9055]="1LIVE diggi";
+channelsnames[9055]="1LIVE diGGi";
channels[9055]="S19.2E-1-1093-28481";
channelsnames[9056]="ANTENNE BAYERN,ANTENNE";
channels[9056]="S19.2E-133-7-170";
@@ -3575,19 +3571,19 @@ channels[9522]="T-8720-2211-116";
channelsnames[9523]="Radio Veronica";
channels[9523]="T-8720-2211-117";
minChan[0] = 1;
-maxChan[0] = 954;
+maxChan[0] = 953;
baseChn[0] = 0;
minChan[1] = 1001;
maxChan[1] = 1965;
baseChn[1] = 1000;
minChan[2] = 2000;
-maxChan[2] = 2228;
+maxChan[2] = 2224;
baseChn[2] = 2000;
minChan[3] = 3000;
maxChan[3] = 3607;
baseChn[3] = 3000;
minChan[4] = 4001;
-maxChan[4] = 4826;
+maxChan[4] = 4820;
baseChn[4] = 4000;
minChan[5] = 5001;
maxChan[5] = 5100;
@@ -3612,4 +3608,4 @@ defChan[6] = minChan[6]; protChn[6] = 1;
defChan[7] = minChan[7]; protChn[7] = 0;
defChan[8] = minChan[8]; protChn[8] = 0;
defChan[9] = minChan[9]; protChn[9] = 0;
-Chan_Ver = "12/25/14 18:21:55" ;
+Chan_Ver = "02/06/15 13:58:04" ;
diff --git a/javascript/main.js b/javascript/main.js
index 31b1d23..87ff833 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -25,7 +25,11 @@ function onLoad() {
aos.setVolume(AudioOut, StartVolume);
aos.setMuteState(AudioOut, false);
showDisplay(currChan.toString(), false, 100, 0 );
- play(channels[currChan]);
+
+ //if box is in standby don't start a stream.
+ if (is.getObject("var.io.state") == "normal") {
+ play(channels[currChan]);
+ }
if (EPGMode) {
eitCache.setFilterMode(eitCache.FILTER_MODE_PF_AND_SCHEDULE);
@@ -170,6 +174,8 @@ function GetSettings() {
is.setObject("vip.css_nr","0",is.STORAGE_PERMANENT)
}
+ GetServerIP();
+
var sel_group;
for (var i=0;i<10;i++) {
sel_group = "vip.group." + i;
@@ -191,7 +197,6 @@ function GetSettings() {
}
audio = Number(is.getObject("vip.languagepriority"));
- server_ip = server_ip_array[Number(is.getObject("vip.serveraddress"))];
for (var i=0;i<10;i++) { if (ServerAdres[i] !== "FullURL" && ServerAdres[i] !== "MultiCast") {ServerAdres[i] = server_ip + StreamPort;} }
ServerAdres[Fav_group] = server_ip + StreamPort;
@@ -267,6 +272,24 @@ function GetSettings() {
}
}
+function GetServerIP(){
+ server_ip = "";
+ if (Number(is.getObject("vip.serveraddress")) == 0) {
+ try {
+ var txt = is.getObject("cfg.portal.whitelisturls");
+ parser=new DOMParser();
+ xmlDoc=parser.parseFromString(txt,"text/xml");
+ var x = xmlDoc.getElementsByTagName("PortalURL")[0].childNodes[0].nodeValue.split("/");
+ server_ip = "http://" + x[2];
+ } catch(e) {;}
+ }
+
+ if (server_ip == "") {
+ server_ip = server_ip_array[Number(is.getObject("vip.serveraddress"))];
+ }
+
+}
+
function loadjs(filename){
var oHead = document.getElementsByTagName('HEAD').item(0);
var oScript= document.createElement("script");
@@ -953,9 +976,6 @@ function onKeyDown(event) {
break;
case "Enter":
// OK key on frontpanel
- if (experimental) {
- RestartPortal();
- }
case KEY_OK:
if(isFullscreen) {
// fullscreen
@@ -2436,7 +2456,10 @@ function onKeyMenu(keyCode) {
}
break;
case "Green":
- if (menu == 1) {
+ if (menu == MainMenu) {
+ menu = 11; // Weather menu
+ InitMenu(menu);
+ } else if (menu == 1) {
Set_Res = Set_Res + 1;
if (Set_Res > (VideoOutputModes.length-1)) { Set_Res = 0;}
// save the info
@@ -2661,12 +2684,11 @@ function onKeyMenu(keyCode) {
}
if (menu == 1) {
- var x = is.getObject("vip.serveraddress");
- x = Number(x);
+ var x = Number(is.getObject("vip.serveraddress"));
if (x < (server_ip_array.length -1)) { x += 1} else { x = 0 }
is.setObject("vip.serveraddress",x.toString(),is.STORAGE_PERMANENT);
+ GetServerIP();
- server_ip = server_ip_array[x];
for (var i=0;i<10;i++) {
if (ServerAdres[i] !== "FullURL" && ServerAdres[i] !== "MultiCast") {ServerAdres[i] = server_ip + StreamPort;}
}
@@ -2822,6 +2844,8 @@ function InitMenu(menu) {
// 8 = ChannelGroups enable/disable
// 9 = INFO2 menu
// 10 = Favorite Edit menu
+// 11 = Weather
+
epg_unactive;
@@ -2879,7 +2903,11 @@ if(menu == 1) { // settings menu
if (subs_prio_dyn.length > 0) { htmltext += " (" + (subs_dyn + 1 ) + "/" + subs_prio_dyn.length + ") "; }
htmltext += "\n 2 - \uE003" + Lang[22] + (is.getObject("cfg.media.subtitling.modepriority"));
htmltext += "\n 3 - \uE003" + Lang[24] + (is.getObject("cfg.media.audio.languagepriority"));
- htmltext += "\n 4 - " + Lang[82] + "\n 5 - VDR : " + server_ip + "\n 6 - ";
+ htmltext += "\n 4 - " + Lang[82];
+ var x = Number(is.getObject("vip.serveraddress"));
+ htmltext += "\n 5 - VDR : ";
+ if (x == 0) { htmltext += Lang[88] + "-> " + server_ip;} else { htmltext += server_ip_array[x];}
+ htmltext += "\n 6 - ";
if (showClock) { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
htmltext += Lang[25] + "\n 7 - ";
if (ShowProtectedChannels) { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
@@ -3078,6 +3106,11 @@ if(menu == 10) { // Favorite edit Menu
mainmenu.innerHTML = htmltext;
}
+if(menu == 11) { // Weather info
+ WeatherInfo();
+}
+
+
} // end of initmenu
function SetGroup(isgroup) {
diff --git a/javascript/news.js b/javascript/news.js
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/javascript/news.js
diff --git a/javascript/settings.js b/javascript/settings.js
index 5b815a9..0d27771 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -2,11 +2,12 @@
// Default settings
//
-var Version = "0.26";
+var Version = "0.27.1";
server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://192.168.178.56","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21","http://192.168.2.100","http://192.168.3.225");
+//server_ip_array[0] isn't used, when set to 0 script tries to find the server
-var server_ip = server_ip_array[0]; // default server
+var server_ip; // default server
var PowerDownServer = 0; // Power Down server from menu by sending cmds. (0 = no /1 = yes)
var PowerDown = 9; //With Easyvdr 0.806 it is cmds 9.
var StartVolume = 15; // Volume on (re)start of the portal.
diff --git a/javascript/weather.js b/javascript/weather.js
new file mode 100644
index 0000000..5ff2953
--- /dev/null
+++ b/javascript/weather.js
@@ -0,0 +1,33 @@
+function WeatherInfo() {
+
+//weather
+//http://www.latlong.net/
+// find long lan
+//
+//
+
+var lat=52.41;
+var lon=6.61;
+
+ xmlhttp=new XMLHttpRequest();
+ xmlhttp.open("GET","http://api.openweathermap.org/data/2.5/weather?lat=" + lat + "&lon=" + lon + "&mode=xml&units=metric&lang=nl",false);
+ xmlhttp.send();
+ xmlDoc=xmlhttp.responseXML;
+ var htmltext = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + ">" + " Current Weather </h1><pre class=mainmenu" + cssres[css_nr][Set_Res] +">";
+ htmltext += " Plaats : " + xmlDoc.getElementsByTagName("city")[0].getAttribute("name") + ",";
+ htmltext += xmlDoc.getElementsByTagName("country")[0].childNodes[0].nodeValue + "\n";
+ htmltext += " Temperatuur : " + Math.round(xmlDoc.getElementsByTagName("temperature")[0].getAttribute("value")*10)/10;
+ htmltext += " " + xmlDoc.getElementsByTagName("temperature")[0].getAttribute("unit") + "\n";
+ htmltext += " Min/Max : " + xmlDoc.getElementsByTagName("temperature")[0].getAttribute("min") + "/";
+ htmltext += xmlDoc.getElementsByTagName("temperature")[0].getAttribute("max");
+ htmltext += " " + xmlDoc.getElementsByTagName("temperature")[0].getAttribute("unit") + "\n";
+ htmltext += " Luchtvochth : " + xmlDoc.getElementsByTagName("humidity")[0].getAttribute("value");
+ htmltext += xmlDoc.getElementsByTagName("humidity")[0].getAttribute("unit") + "\n";
+ htmltext += " Wind : " + xmlDoc.getElementsByTagName("speed")[0].getAttribute("value") + " m/s, ";
+ htmltext += xmlDoc.getElementsByTagName("direction")[0].getAttribute("name") + "\n";
+ htmltext += " Bewolking : " + xmlDoc.getElementsByTagName("clouds")[0].getAttribute("value") + "%\n";
+ htmltext += "\n Update : " + xmlDoc.getElementsByTagName("lastupdate")[0].getAttribute("value") + "\n";
+ htmltext += "</pre>";
+ mainmenu.innerHTML = htmltext;
+
+}
diff --git a/languages/lang_dut.js b/languages/lang_dut.js
index 09953da..7d2cd97 100644
--- a/languages/lang_dut.js
+++ b/languages/lang_dut.js
@@ -115,6 +115,7 @@ Lang[84] = " schuif op ";
Lang[85] = " schuif neer ";
Lang[86] = " Toevoegen ";
Lang[87] = " Wissen ";
+Lang[88] = "Gevonden ";
Lang[90] = "Deze zender zit niet in je pakket";
diff --git a/languages/lang_eng.js b/languages/lang_eng.js
index 1f03541..32c8943 100644
--- a/languages/lang_eng.js
+++ b/languages/lang_eng.js
@@ -115,6 +115,6 @@ Lang[84] = " Move UP ";
Lang[85] = " Move Down ";
Lang[86] = " ADD ";
Lang[87] = " Delete ";
-
+Lang[88] = "Found ";
Lang[90] = "No subscription for this channel";
diff --git a/languages/lang_ger.js b/languages/lang_ger.js
index 23e67dd..5087397 100644
--- a/languages/lang_ger.js
+++ b/languages/lang_ger.js
@@ -11,7 +11,7 @@ NN[5] = "INFO";
NN[6] = "ZURUCK";
lang_prio_lang = new Array("Hollaendisch", "Deutsch", "Englisch", "Franzoesisch");
-months = new Array("Januar", "Februar", "Maerz", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember ");
+months = new Array('Januar', 'Februar', 'Maerz', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember');
days = new Array("Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag");
searchmode = new Array('Ausdruck', 'alle Woerter', 'zumindest ein Wort','genau uebereinstimmen', 'regex', 'Fuzzy');
@@ -114,6 +114,7 @@ Lang[84] = " Nach oben ";
Lang[85] = " Nach unten ";
Lang[86] = " hinzufugen ";
Lang[87] = " Loschen ";
-
+Lang[88] = "Gefunden ";
Lang[90] = "Kein Abo fur diesen Kanal";
+