With VDR patch no more zap delay needed

See http://www.vdr-portal.de/board17-developer/board97-vdr-core/p1274114-ring-buffer-overflows-cdevice-detach-blockiert/#post1274114

4 files changed, 196 insertions, 182 deletions

diff --git a/History b/History
index d2ae27d..a8219e2 100644
--- a/History
+++ b/History
@@ -11,6 +11,7 @@ VDR 1.7.29+
 0.28	Time to display volume info can be set independant from other OSD timeout.
 	Key_TV/RADIO - Don't save current channel if current group is protected.
 	Radio Group can be set from settings.
+	ZapDelay can be turned off, needs VDR patch
 
 
 0.27	Weather info from openweathermap.org added. You can add your own api key, see settings.js
diff --git a/javascript/channels.js b/javascript/channels.js
index 75b1273..619b64b 100644
--- a/javascript/channels.js
+++ b/javascript/channels.js
@@ -1,21 +1,21 @@
-channelsnames[1]="NPO1";
-channels[1]="S19.2E-53-1105-4011";
-channelsnames[2]="NPO2";
-channels[2]="S19.2E-53-1105-4012";
-channelsnames[3]="NPO3";
-channels[3]="S19.2E-53-1105-4013";
-channelsnames[4]="RTL4";
-channels[4]="S19.2E-53-1105-4044";
-channelsnames[5]="RTL5";
-channels[5]="S19.2E-53-1105-4045";
-channelsnames[6]="SBS6";
-channels[6]="S19.2E-53-1105-4002";
-channelsnames[7]="RTL7";
-channels[7]="S19.2E-53-1105-4047";
+channelsnames[1]="NPO1 HD";
+channels[1]="S23.5E-3-3225-21029";
+channelsnames[2]="NPO2 HD";
+channels[2]="S23.5E-3-3202-6080";
+channelsnames[3]="NPO3 HD";
+channels[3]="S23.5E-3-3225-21040";
+channelsnames[4]="RTL4 HD";
+channels[4]="S23.5E-3-3208-7020";
+channelsnames[5]="RTL5 HD";
+channels[5]="S23.5E-3-3208-7023";
+channelsnames[6]="SBS6 HD";
+channels[6]="S23.5E-3-3202-6090";
+channelsnames[7]="RTL7 HD";
+channels[7]="S23.5E-3-3208-7027";
 channelsnames[8]="Veronica/DisneyXD HD";
 channels[8]="S23.5E-3-3225-21035";
-channelsnames[9]="NET5";
-channels[9]="S19.2E-53-1105-4003";
+channelsnames[9]="NET5 HD";
+channels[9]="S23.5E-3-3225-21020";
 channelsnames[10]="BVN TV";
 channels[10]="S19.2E-1-1048-4320";
 channelsnames[11]="RTL8 HD";
@@ -24,7 +24,7 @@ channelsnames[12]="Nick/Spike";
 channels[12]="S19.2E-1-1078-28679";
 channelsnames[13]="SBS9";
 channels[13]="S23.5E-3-3222-20945";
-channelsnames[14]="ComedyCentral";
+channelsnames[14]="Test";
 channels[14]="S23.5E-3-3211-20826";
 channelsnames[15]="FOX Channel";
 channels[15]="S23.5E-3-3202-6030";
@@ -46,7 +46,7 @@ channelsnames[23]="Animal Planet";
 channels[23]="S23.5E-3-3221-5040";
 channelsnames[24]="Investigation Discovery";
 channels[24]="S23.5E-3-3202-6045";
-channelsnames[25]="Crime Invest.";
+channelsnames[25]="Crime Invest. OBSOLETE";
 channels[25]="S23.5E-3-3208-7052";
 channelsnames[26]="AutoMotorSport HD";
 channels[26]="S23.5E-3-3217-6103";
@@ -70,7 +70,7 @@ channelsnames[35]="ONS";
 channels[35]="S23.5E-3-3222-20956";
 channelsnames[36]="the QYOU";
 channels[36]="S23.5E-3-3202-6094";
-channelsnames[37]="Discovery Showcase HD";
+channelsnames[37]="Discovery Showcase HD OBSOLETE";
 channels[37]="S23.5E-3-3205-5033";
 channelsnames[38]="Infokanaal TVV";
 channels[38]="S19.2E-53-1119-12810";
@@ -146,7 +146,7 @@ channelsnames[75]="YESTERDAY+1";
 channels[75]="S28.2E-2-2015-7650";
 channelsnames[76]="Drama";
 channels[76]="S28.2E-2-2006-6522";
-channelsnames[77]="CI";
+channelsnames[77]="Crime+Inv";
 channels[77]="S28.2E-2-2025-4802";
 channelsnames[78]="History";
 channels[78]="S28.2E-2-2025-4653";
@@ -200,11 +200,11 @@ channelsnames[105]="Sky Family";
 channels[105]="S28.2E-2-2012-4403";
 channelsnames[106]="Sky Thriller";
 channels[106]="S28.2E-2-2012-4406";
-channelsnames[107]="Sky DramaRom";
+channelsnames[107]="SkyDramaRom";
 channels[107]="S28.2E-2-2012-5502";
 channelsnames[108]="Sky ScFi/Horror";
 channels[108]="S28.2E-2-2012-4304";
-channelsnames[109]="Sky Superhero";
+channelsnames[109]="Sky Greats";
 channels[109]="S28.2E-2-2012-5650";
 channelsnames[110]="Sky Select";
 channels[110]="S28.2E-2-2012-4306";
@@ -214,9 +214,9 @@ channelsnames[112]="TCM";
 channels[112]="S28.2E-2-2023-5714";
 channelsnames[113]="TCM+1";
 channels[113]="S28.2E-2-2301-52175";
-channelsnames[114]="Christmas 24";
+channelsnames[114]="Movies 24";
 channels[114]="S28.2E-2-2109-52265";
-channelsnames[115]="Christmas 24+";
+channelsnames[115]="Movies 24+";
 channels[115]="S28.2E-2-2109-52270";
 channelsnames[116]="HBO";
 channels[116]="S23.5E-3-3209-13104";
@@ -370,10 +370,10 @@ channelsnames[251]="True Movies 1";
 channels[251]="S28.2E-2-2110-53320";
 channelsnames[252]="True Movies 2";
 channels[252]="S28.2E-2-2110-53325";
-channelsnames[253]="RTE One";
-channels[253]="S28.2E-2-2043-9601";
-channelsnames[254]="RTE2";
-channels[254]="S28.2E-2-2043-9602";
+channelsnames[253]="RTÉ One";
+channels[253]="S28.2E-2-2029-2801";
+channelsnames[254]="RTÉ2";
+channels[254]="S28.2E-2-2029-2802";
 channelsnames[255]="Setanta Ireland";
 channels[255]="S28.2E-2-2081-51111";
 channelsnames[256]="Setanta Sports1";
@@ -592,7 +592,7 @@ channelsnames[430]="VOX";
 channels[430]="S19.2E-1-1089-12060";
 channelsnames[431]="kabel eins classics";
 channels[431]="S19.2E-1-1107-17506";
-channelsnames[432]="RTL Living";
+channelsnames[432]="TOGGO plus";
 channels[432]="S19.2E-1-1089-12030";
 channelsnames[433]="ProSieben MAXX";
 channels[433]="S19.2E-1-1107-17505";
@@ -738,7 +738,7 @@ channelsnames[554]="Bike";
 channels[554]="S28.2E-2-2109-52290";
 channelsnames[555]="Dubai Sports 3";
 channels[555]="S13.0E-318-5103-9502";
-channelsnames[556]="Eurosport";
+channelsnames[556]="Eurosport 1";
 channels[556]="S28.2E-2-2023-5713";
 channelsnames[557]="Eurosport 2";
 channels[557]="S28.2E-2-2023-5009";
@@ -766,20 +766,22 @@ channelsnames[568]="ESP2 Int'l";
 channels[568]="S13.0E-318-200-13801";
 channelsnames[569]="Eurosport 1HD NL";
 channels[569]="S23.5E-3-3222-21217";
-channelsnames[570]="Eurosport 2 NL";
-channels[570]="S19.2E-53-1119-12899";
-channelsnames[571]="FOX Sports EDL 1 HD";
-channels[571]="S23.5E-3-3202-6092";
-channelsnames[572]="FOX Sports 2 HD int";
-channels[572]="S23.5E-3-3225-21045";
-channelsnames[573]="FOX Sports EDL 3";
-channels[573]="S23.5E-3-3222-20935";
-channelsnames[574]="Ziggo Sport Select HD";
-channels[574]="S23.5E-3-3222-20960";
-channelsnames[575]="Ziggo Sport Voetbal";
-channels[575]="S23.5E-3-3222-20925";
-channelsnames[576]="Ziggo Sport Golf";
-channels[576]="S23.5E-3-3222-20930";
+channelsnames[570]="EUROSPORT2 NL";
+channels[570]="S23.5E-3-3208-7060";
+channelsnames[571]="Eurosport 2 NL";
+channels[571]="S19.2E-53-1119-12899";
+channelsnames[572]="FOX Sports EDL 1 HD";
+channels[572]="S23.5E-3-3202-6092";
+channelsnames[573]="FOX Sports 2 HD int";
+channels[573]="S23.5E-3-3225-21045";
+channelsnames[574]="FOX Sports EDL 3";
+channels[574]="S23.5E-3-3222-20935";
+channelsnames[575]="Ziggo Sport Select HD";
+channels[575]="S23.5E-3-3222-20960";
+channelsnames[576]="Ziggo Sport Voetbal";
+channels[576]="S23.5E-3-3222-20925";
+channelsnames[577]="Ziggo Sport Golf";
+channels[577]="S23.5E-3-3222-20930";
 channelsnames[600]="DELUXE MUSIC,DELUXE";
 channels[600]="S19.2E-133-7-65";
 channelsnames[601]="Vintage TV";
@@ -796,9 +798,9 @@ channelsnames[606]="Retro Music TV";
 channels[606]="S23.5E-3-3205-5052";
 channelsnames[607]="KADET";
 channels[607]="S23.5E-3-3222-21110";
-channelsnames[608]="MTV NL";
+channelsnames[608]="MTV NL OBSOLETE";
 channels[608]="S23.5E-3-3222-20947";
-channelsnames[609]="TV Oranje";
+channelsnames[609]="TV Oranje OBSOLETE";
 channels[609]="S23.5E-3-3222-20948";
 channelsnames[610]="iConcerts";
 channels[610]="S23.5E-3-3226-730";
@@ -830,7 +832,7 @@ channelsnames[623]="The Vault";
 channels[623]="S28.2E-2-2110-53355";
 channelsnames[624]="Chart Show TV";
 channels[624]="S28.2E-2-2110-53365";
-channelsnames[625]="Heart Xmas";
+channelsnames[625]="Heart TV";
 channels[625]="S28.2E-2-2095-55111";
 channelsnames[626]="CAPITAL TV";
 channels[626]="S28.2E-2-2095-55112";
@@ -846,11 +848,11 @@ channelsnames[631]="VH1.";
 channels[631]="S19.2E-1-1066-28666";
 channelsnames[632]="VH1 Classic.";
 channels[632]="S19.2E-1-1066-28667";
-channelsnames[633]="MTV ROCKS.";
+channelsnames[633]="MTV ROCKS. OBSOLETE";
 channels[633]="S19.2E-1-1066-28669";
 channelsnames[634]="Comedy Central/VIVA";
 channels[634]="S19.2E-1-1078-28676";
-channelsnames[635]="MTV Hits.";
+channelsnames[635]="MTV Hits. OBSOLETE";
 channels[635]="S19.2E-1-1066-28664";
 channelsnames[636]="MTV";
 channels[636]="S28.2E-2-2010-7001";
@@ -1118,56 +1120,50 @@ channelsnames[951]="Travel Ch +1";
 channels[951]="S28.2E-2-2301-52100";
 channelsnames[952]="Discovery Travel";
 channels[952]="S13.0E-64511-800-1465";
-channelsnames[1001]="NPO1 HD";
-channels[1001]="S23.5E-3-3225-21029";
-channelsnames[1002]="NPO2 HD";
-channels[1002]="S23.5E-3-3202-6080";
-channelsnames[1003]="NPO3 HD";
-channels[1003]="S23.5E-3-3225-21040";
-channelsnames[1004]="RTL4 HD";
-channels[1004]="S23.5E-3-3208-7020";
-channelsnames[1005]="RTL5 HD";
-channels[1005]="S23.5E-3-3208-7023";
-channelsnames[1006]="SBS6 HD";
-channels[1006]="S23.5E-3-3202-6090";
-channelsnames[1007]="RTL7 HD";
-channels[1007]="S23.5E-3-3208-7027";
-channelsnames[1009]="NET5 HD";
-channels[1009]="S23.5E-3-3225-21020";
-channelsnames[1010]="History HD DUT";
-channels[1010]="S23.5E-3-3205-5151";
-channelsnames[1011]="Travel Channel HD WE";
-channels[1011]="S23.5E-3-3221-5056";
-channelsnames[1012]="Travel Channel HD NL";
-channels[1012]="S23.5E-3-3211-20898";
-channelsnames[1013]="Travel Channel HD";
-channels[1013]="S23.5E-3-3211-20895";
-channelsnames[1014]="Travel Channel HD CZ";
-channels[1014]="S23.5E-3-3211-20897";
-channelsnames[1015]="Food Network HD";
-channels[1015]="S23.5E-3-3211-20893";
-channelsnames[1016]="Food Network HD CZ";
-channels[1016]="S23.5E-3-3211-20894";
-channelsnames[1017]="NGC HD";
-channels[1017]="S23.5E-3-3222-20965";
-channelsnames[1018]="Reality Kings";
-channels[1018]="S23.5E-3-3208-7040";
-channelsnames[1019]="Nat Geo Wild HD DUT";
-channels[1019]="S23.5E-3-3226-709";
-channelsnames[1020]="Crime and Invest. CZ";
-channels[1020]="S23.5E-3-3208-7053";
-channelsnames[1021]="EDGE CZ";
-channels[1021]="S23.5E-3-3202-6151";
-channelsnames[1022]="Boomerang CZ";
-channels[1022]="S23.5E-3-3202-6036";
-channelsnames[1023]="Food Network CZ";
-channels[1023]="S23.5E-3-3211-20837";
-channelsnames[1024]="Outdoor Channel HD CZ";
-channels[1024]="S23.5E-3-3211-20900";
-channelsnames[1025]="E! Entertainment CZ";
-channels[1025]="S23.5E-3-3205-5152";
-channelsnames[1026]="Fine Living HD CZ";
-channels[1026]="S23.5E-3-3211-20902";
+channelsnames[1001]="NPO3";
+channels[1001]="S19.2E-53-1105-4013";
+channelsnames[1002]="NPO2";
+channels[1002]="S19.2E-53-1105-4012";
+channelsnames[1003]="SBS6";
+channels[1003]="S19.2E-53-1105-4002";
+channelsnames[1004]="RTL4";
+channels[1004]="S19.2E-53-1105-4044";
+channelsnames[1005]="RTL5";
+channels[1005]="S19.2E-53-1105-4045";
+channelsnames[1009]="Mnam TV";
+channels[1009]="S23.5E-3-3205-5151";
+channelsnames[1010]="Travel Channel HD WE";
+channels[1010]="S23.5E-3-3221-5056";
+channelsnames[1011]="Travel Channel HD NL";
+channels[1011]="S23.5E-3-3211-20898";
+channelsnames[1012]="Travel Channel HD";
+channels[1012]="S23.5E-3-3211-20895";
+channelsnames[1013]="Travel Channel HD CZ";
+channels[1013]="S23.5E-3-3211-20897";
+channelsnames[1014]="Food Network HD";
+channels[1014]="S23.5E-3-3211-20893";
+channelsnames[1015]="Food Network HD CZ";
+channels[1015]="S23.5E-3-3211-20894";
+channelsnames[1016]="NGC HD";
+channels[1016]="S23.5E-3-3222-20965";
+channelsnames[1017]="Reality Kings";
+channels[1017]="S23.5E-3-3208-7040";
+channelsnames[1018]="Nat Geo Wild HD DUT";
+channels[1018]="S23.5E-3-3226-709";
+channelsnames[1019]="Crime and Invest. CZ OBSOLETE";
+channels[1019]="S23.5E-3-3208-7053";
+channelsnames[1020]="EDGE CZ";
+channels[1020]="S23.5E-3-3202-6151";
+channelsnames[1021]="Boomerang CZ";
+channels[1021]="S23.5E-3-3202-6036";
+channelsnames[1022]="Food Network CZ";
+channels[1022]="S23.5E-3-3211-20837";
+channelsnames[1023]="Outdoor Channel HD CZ";
+channels[1023]="S23.5E-3-3211-20900";
+channelsnames[1024]="E! Entertainment CZ";
+channels[1024]="S23.5E-3-3205-5152";
+channelsnames[1025]="Fine Living HD CZ";
+channels[1025]="S23.5E-3-3211-20902";
 channelsnames[1041]="AB3";
 channels[1041]="S19.2E-53-1119-12802";
 channelsnames[1100]="SkyPremiereHD";
@@ -1414,15 +1410,15 @@ channelsnames[1700]="NHK World HD";
 channels[1700]="S28.2E-2-2312-53147";
 channelsnames[1701]="RT HD";
 channels[1701]="S28.2E-2-2312-53148";
-channelsnames[1800]="HBO Comedy";
+channelsnames[1800]="Viasat HD";
 channels[1800]="S23.5E-3-3205-5035";
-channelsnames[1801]="Filmbox HD";
+channelsnames[1801]="Filmbox Extra HD";
 channels[1801]="S23.5E-3-3205-5034";
-channelsnames[1802]="Prima HD";
+channelsnames[1802]="Discovery CZ";
 channels[1802]="S23.5E-3-3205-5032";
-channelsnames[1803]="Nova Sport HD";
+channelsnames[1803]="Film+";
 channels[1803]="S23.5E-3-3205-5031";
-channelsnames[1804]="Nova HD";
+channelsnames[1804]="Disney CZ";
 channels[1804]="S23.5E-3-3205-5030";
 channelsnames[1805]="Eurosport 2 HD";
 channels[1805]="S23.5E-3-3221-5041";
@@ -1830,7 +1826,7 @@ channelsnames[3004]="LTV1";
 channels[3004]="S5.0E-85-14-6390";
 channelsnames[3005]="LTV World";
 channels[3005]="S5.0E-85-2-240";
-channelsnames[3006]="Kidzone";
+channelsnames[3006]="Kidzone TV";
 channels[3006]="S5.0E-85-14-6370";
 channelsnames[3007]="TV1 Lithuania";
 channels[3007]="S5.0E-85-52-2900";
@@ -2922,7 +2918,7 @@ channelsnames[4723]="HBO HD";
 channels[4723]="S13.0E-113-7900-10511";
 channelsnames[4724]="Disney Junior";
 channels[4724]="S13.0E-113-7900-10552";
-channelsnames[4725]="CN/TCM";
+channelsnames[4725]="CN/TCM OBSOLETE";
 channels[4725]="S13.0E-318-12200-7457";
 channelsnames[4726]="Noursat";
 channels[4726]="S13.0E-318-12200-7402";
@@ -2930,7 +2926,7 @@ channelsnames[4727]="Al Hiwar";
 channels[4727]="S13.0E-318-12200-7456";
 channelsnames[4728]="DMC";
 channels[4728]="S13.0E-318-12200-7459";
-channelsnames[4729]="Miracle TV";
+channelsnames[4729]="Miracle TV OBSOLETE";
 channels[4729]="S13.0E-318-12200-7460";
 channelsnames[4730]="Al Forat OBSOLETE";
 channels[4730]="S13.0E-318-12200-7463";
@@ -2938,7 +2934,7 @@ channelsnames[4731]="Al Fady";
 channels[4731]="S13.0E-318-12200-7464";
 channelsnames[4732]="Cartoon Network";
 channels[4732]="S13.0E-318-12200-7467";
-channelsnames[4733]="Turner Classic Movies";
+channelsnames[4733]="Turner Classic Movies OBSOLETE";
 channels[4733]="S13.0E-318-12200-7468";
 channelsnames[4734]="RFI Persian";
 channels[4734]="S13.0E-318-12200-7469";
@@ -2946,7 +2942,7 @@ channelsnames[4735]="Sat 7 Pars";
 channels[4735]="S13.0E-318-12200-7470";
 channelsnames[4736]="Velayat TV";
 channels[4736]="S13.0E-318-12200-7471";
-channelsnames[4737]="Ahl E Bait";
+channelsnames[4737]="Ahl E Bait OBSOLETE";
 channels[4737]="S13.0E-318-12200-7476";
 channelsnames[4738]="ESP2 Dutch";
 channels[4738]="S13.0E-318-200-13802";
@@ -3120,7 +3116,7 @@ channelsnames[6021]="Television X";
 channels[6021]="S28.2E-2-2102-54050";
 channelsnames[6022]="Red Hot";
 channels[6022]="S28.2E-2-2102-54054";
-channelsnames[6023]="TVX Brits";
+channelsnames[6023]="TVXXX";
 channels[6023]="S28.2E-2-2102-54053";
 channelsnames[6024]="Climax";
 channels[6024]="S28.2E-2-2316-53592";
@@ -3220,7 +3216,7 @@ channelsnames[8010]="ID";
 channels[8010]="T-8720-2244-44";
 channelsnames[8011]="RTL 8";
 channels[8011]="T-8720-2213-32";
-channelsnames[8012]="Nickelodeon/TeenNick";
+channelsnames[8012]="Nickelodeon / Spike";
 channels[8012]="T-8720-2244-41";
 channelsnames[8013]="Comedy Central";
 channels[8013]="T-8720-2213-35";
@@ -3254,68 +3250,70 @@ channelsnames[8027]="TV Oost";
 channels[8027]="T-8720-2214-1104";
 channelsnames[8028]="Ketnet/OP12";
 channels[8028]="T-8720-2244-46";
-channelsnames[8029]="TV Gelderland";
-channels[8029]="T-0-0-1104";
-channelsnames[8030]="ZDF";
-channels[8030]="T-8468-514-514";
-channelsnames[8031]="3sat";
-channels[8031]="T-8468-514-515";
-channelsnames[8032]="ZDFinfo";
-channels[8032]="T-8468-514-516";
-channelsnames[8033]="neo/KiKA";
-channels[8033]="T-8468-514-517";
-channelsnames[8034]="arte";
-channels[8034]="T-8468-6144-2";
+channelsnames[8029]="INFORMATIE";
+channels[8029]="T-8720-2244-47";
+channelsnames[8030]="TV Gelderland";
+channels[8030]="T-0-0-1104";
+channelsnames[8031]="ZDF";
+channels[8031]="T-8468-514-514";
+channelsnames[8032]="3sat";
+channels[8032]="T-8468-514-515";
+channelsnames[8033]="ZDFinfo";
+channels[8033]="T-8468-514-516";
+channelsnames[8034]="neo/KiKA";
+channels[8034]="T-8468-514-517";
 channelsnames[8035]="arte";
-channels[8035]="T-8468-14849-2";
-channelsnames[8036]="arte OBSOLETE";
-channels[8036]="T-8720-2214-2";
-channelsnames[8037]="PHOENIX";
-channels[8037]="T-8468-6144-3";
-channelsnames[8038]="PHOENIX OBSOLETE";
-channels[8038]="T-8720-2214-3";
-channelsnames[8039]="PHOENIX";
-channels[8039]="T-8468-14849-3";
-channelsnames[8040]="Einsfestival";
-channels[8040]="T-8468-6144-5";
-channelsnames[8041]="Einsfestival OBSOLETE";
-channels[8041]="T-8720-2214-5";
-channelsnames[8042]="Einsfestival";
-channels[8042]="T-8468-14849-5";
-channelsnames[8043]="Das Erste";
-channels[8043]="T-8468-6144-256";
-channelsnames[8044]="Das Erste OBSOLETE";
-channels[8044]="T-8720-2214-256";
-channelsnames[8045]="Das Erste";
-channels[8045]="T-8468-14849-256";
-channelsnames[8046]="hr-fernsehen";
-channels[8046]="T-0-0-65";
+channels[8035]="T-8468-6144-2";
+channelsnames[8036]="arte";
+channels[8036]="T-8468-14849-2";
+channelsnames[8037]="arte OBSOLETE";
+channels[8037]="T-8720-2214-2";
+channelsnames[8038]="PHOENIX";
+channels[8038]="T-8468-6144-3";
+channelsnames[8039]="PHOENIX OBSOLETE";
+channels[8039]="T-8720-2214-3";
+channelsnames[8040]="PHOENIX";
+channels[8040]="T-8468-14849-3";
+channelsnames[8041]="Einsfestival";
+channels[8041]="T-8468-6144-5";
+channelsnames[8042]="Einsfestival OBSOLETE";
+channels[8042]="T-8720-2214-5";
+channelsnames[8043]="Einsfestival";
+channels[8043]="T-8468-14849-5";
+channelsnames[8044]="Das Erste";
+channels[8044]="T-8468-6144-256";
+channelsnames[8045]="Das Erste OBSOLETE";
+channels[8045]="T-8720-2214-256";
+channelsnames[8046]="Das Erste";
+channels[8046]="T-8468-14849-256";
 channelsnames[8047]="hr-fernsehen";
-channels[8047]="T-8468-38912-65";
-channelsnames[8048]="MDR FERNSEHEN";
-channels[8048]="T-0-0-100";
+channels[8047]="T-0-0-65";
+channelsnames[8048]="hr-fernsehen";
+channels[8048]="T-8468-38912-65";
 channelsnames[8049]="MDR FERNSEHEN";
-channels[8049]="T-8468-38912-100";
-channelsnames[8050]="NDR FS NDS";
-channels[8050]="T-8468-38912-129";
+channels[8049]="T-0-0-100";
+channelsnames[8050]="MDR FERNSEHEN";
+channels[8050]="T-8468-38912-100";
 channelsnames[8051]="NDR FS NDS";
-channels[8051]="T-0-0-129";
-channelsnames[8052]="NDR FS HH*";
-channels[8052]="T-0-0-130";
+channels[8051]="T-8468-38912-129";
+channelsnames[8052]="NDR FS NDS";
+channels[8052]="T-0-0-129";
 channelsnames[8053]="NDR FS HH*";
-channels[8053]="T-8468-38912-130";
-channelsnames[8054]="NDR FS SH*";
-channels[8054]="T-8468-38912-131";
+channels[8053]="T-0-0-130";
+channelsnames[8054]="NDR FS HH*";
+channels[8054]="T-8468-38912-130";
 channelsnames[8055]="NDR FS SH*";
-channels[8055]="T-0-0-131";
-channelsnames[8056]="NDR FS MVP*";
-channels[8056]="T-0-0-132";
+channels[8055]="T-8468-38912-131";
+channelsnames[8056]="NDR FS SH*";
+channels[8056]="T-0-0-131";
 channelsnames[8057]="NDR FS MVP*";
-channels[8057]="T-8468-38912-132";
-channelsnames[8058]="WDR Köln";
-channels[8058]="T-0-0-262";
+channels[8057]="T-0-0-132";
+channelsnames[8058]="NDR FS MVP*";
+channels[8058]="T-8468-38912-132";
 channelsnames[8059]="WDR Köln";
-channels[8059]="T-8468-38912-262";
+channels[8059]="T-0-0-262";
+channelsnames[8060]="WDR Köln";
+channels[8060]="T-8468-38912-262";
 channelsnames[9001]="NPO Radio1";
 channels[9001]="S23.5E-3-3211-20860";
 channelsnames[9002]="NPO Radio2";
@@ -3326,7 +3324,7 @@ channelsnames[9004]="NPO Radio4";
 channels[9004]="S23.5E-3-3211-20866";
 channelsnames[9005]="NPO Radio5";
 channels[9005]="S23.5E-3-3211-20867";
-channelsnames[9006]="NPO Radio6";
+channelsnames[9006]="NPO Radio6 OBSOLETE";
 channels[9006]="S23.5E-3-3211-20868";
 channelsnames[9007]="Radio Oost";
 channels[9007]="S23.5E-3-3211-20844";
@@ -3342,7 +3340,7 @@ channelsnames[9012]="Radio 538";
 channels[9012]="S23.5E-3-3211-20876";
 channelsnames[9013]="Radio 10";
 channels[9013]="S23.5E-3-3211-20878";
-channelsnames[9014]="Slam FM";
+channelsnames[9014]="Slam FM OBSOLETE";
 channels[9014]="S23.5E-3-3211-20880";
 channelsnames[9015]="BNR Nieuwsradio";
 channels[9015]="S23.5E-3-3211-20882";
@@ -3352,7 +3350,7 @@ channelsnames[9017]="100% NL";
 channels[9017]="S23.5E-3-3211-20890";
 channelsnames[9018]="Arrow Jazz";
 channels[9018]="S19.2E-53-1097-2062";
-channelsnames[9019]="Christliches Radio";
+channelsnames[9019]="Radio Lebensquelle";
 channels[9019]="S19.2E-53-1105-4060";
 channelsnames[9020]="VRT Radio1";
 channels[9020]="S19.2E-53-1119-12778";
@@ -3492,7 +3490,7 @@ minChan[6] = 6001;
 maxChan[6] = 6061;
 baseChn[6] = 6000;
 minChan[8] = 8001;
-maxChan[8] = 8059;
+maxChan[8] = 8060;
 baseChn[8] = 8000;
 minChan[9] = 9001;
 maxChan[9] = 9528;
@@ -3508,4 +3506,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 = "01/16/16 23:48:06" ;
+Chan_Ver = "06/02/16 23:29:20" ;
diff --git a/javascript/main.js b/javascript/main.js
index 4390622..b9730f8 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -517,9 +517,11 @@ try {
 
 function play(uri) {
   try {
-    if (initialDelayID != -1) { clearTimeout(initialDelayID); initialDelayID = -1; }
-    if (PlayDelayID != -1) { clearTimeout(PlayDelayID); PlayDelayID = -1; }
-    if (initialDelayPlayID != -1) { clearTimeout(initialDelayPlayID); initialDelayPlayID = -1; }
+    if (Delay_Play == 1) {
+    	if (initialDelayID != -1) { clearTimeout(initialDelayID); initialDelayID = -1; }
+	if (PlayDelayID != -1) { clearTimeout(PlayDelayID); PlayDelayID = -1; }
+	if (initialDelayPlayID != -1) { clearTimeout(initialDelayPlayID); initialDelayPlayID = -1; }
+    }
 
     if (mediaPlayer.getState() != mediaPlayer.STATE_IDLE) { mediaPlayer.close(); }
     if (isSchedule) { schedule.style.opacity = 0; isSchedule = 0;}
@@ -543,11 +545,17 @@ function play(uri) {
 	//alert(uri);
 	//alert(ChanGroup);
 
-
-    URL = uri;
-    initialDelayPlayID = setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",initialDelayPlay);
-    initialDelayPlay = initialDelayPlayTime;
-    PlayDelayID = setTimeout("initialDelayPlay = 0;",initialDelayPlayNormal);
+    if (Delay_Play == 0) {
+	    mediaPlayer.open(uri);
+	    mediaPlayer.play(1000);
+	    GetEPG(currChan);
+	    ExtraStuff();
+    } else {
+	    URL = uri;
+	    initialDelayPlayID = setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",initialDelayPlay);
+	    initialDelayPlay = initialDelayPlayTime;
+	    PlayDelayID = setTimeout("initialDelayPlay = 0;",initialDelayPlayNormal);
+    }
     SetLed(1,1,0);
 
     if(isFullscreen) { showOSD(); }
@@ -1690,8 +1698,10 @@ if (!BackGroundColor) { BackGroundColor = color_default;}
 		}
 
 		//	switchtimer.style.background = BackGroundColor;
-			switchtimer.innerHTML = "<pre class=" + BackGroundColor + cssres[css_nr][Set_Res] + ">" + Lang[2] + ProgName 
-						+ "\n" + Lang[3] + channelsnames[currChan] + "\n" + x + "</pre>";
+			
+			switchtimer.innerHTML = "<pre class=" + BackGroundColor + cssres[css_nr][Set_Res] + ">"
+//						+ Sw_Timer[SwitchTimer] + "\n"
+						+ Lang[2] + ProgName + "\n" + Lang[3] + channelsnames[currChan] + "\n" + x + "</pre>";
 			setOSDtimer();
 
 			switchtimer.style.opacity = 1;
diff --git a/javascript/settings.js b/javascript/settings.js
index 9396f84..f3fcc1d 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -2,7 +2,7 @@
 // Default settings
 // 
 
-var Version = "0.28.02";
+var Version = "0.28.03";
 
 //weather
 var city = "Almelo";
@@ -37,6 +37,8 @@ var Use_DLNA;// DLNA testing
 var MenuOffID; //Menu remove timeout
 var MenuTimeOut = 1 * 60 * 1000; // 1 minutes TimeOut
 
+var Delay_Play = 0; // Patched VDR or Only FTA channels = 0, Unpatched VDR = 1
+
 var RadioGroup = 9;
 
 OSDLang = new Array ("English", "Nederlands", "Deutsch", "Suomi");
@@ -313,7 +315,6 @@ var timerChan = 10;
 var TimerActions;
 var initialDelayID = 0;
 var initialDelayPlayTime = 1000; // wait 1000 ms before zap to next channel
-//var initialDelayPlayTime = 0; // no wait before zap to next channel
 var initialDelayPlayNormal = 5000; // back to normal after 5000ms
 var CAdelayID = 0;
 var ProtectID = 0;
@@ -417,3 +418,7 @@ var color_switchtimer = "color_switchtimer";
 var color_default = "color_default";
 var color_error = "color_error";
 var MACaddress; //BOX mac address, used for uniq box config loading
+
+Sw_Timer = new Array("None", "SwitchOnly", "Record Server", "Record Local" , "Sleeptimer");
+
+