From afc399fdf696cf8bfe8992da5033ee0f542d5394 Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Thu, 10 Dec 2015 22:59:12 +0100 Subject: Some fixed settings -> variable in settings.js channels update --- javascript/channels.js | 318 ++++++++++++++++++++++++++----------------------- javascript/main.js | 15 ++- javascript/settings.js | 2 + 3 files changed, 182 insertions(+), 153 deletions(-) diff --git a/javascript/channels.js b/javascript/channels.js index aa7738f..19cf3b0 100644 --- a/javascript/channels.js +++ b/javascript/channels.js @@ -103,39 +103,39 @@ channels[53]="S28.2E-2-2009-6204"; channelsnames[54]="Disc.History"; channels[54]="S28.2E-2-2009-6207"; channelsnames[55]="Disc.History+1"; -channels[55]="S28.2E-2-2407-52435"; +channels[55]="S28.2E-2-2097-52435"; channelsnames[56]="TLC"; channels[56]="S28.2E-2-2009-6233"; channelsnames[57]="TLC+1"; -channels[57]="S28.2E-2-2407-52446"; +channels[57]="S28.2E-2-2097-52446"; channelsnames[58]="Disc.Science"; channels[58]="S28.2E-2-2009-6206"; channelsnames[59]="Disc.Sci+1"; -channels[59]="S28.2E-2-2407-52410"; +channels[59]="S28.2E-2-2097-52410"; channelsnames[60]="Disc.Turbo"; channels[60]="S28.2E-2-2009-6209"; channelsnames[61]="Discovery Shed"; -channels[61]="S28.2E-2-2407-52440"; +channels[61]="S28.2E-2-2097-52440"; channelsnames[62]="Home & Health"; channels[62]="S28.2E-2-2009-6208"; channelsnames[63]="Home&Health+"; -channels[63]="S28.2E-2-2407-52450"; +channels[63]="S28.2E-2-2097-52450"; channelsnames[64]="ID"; -channels[64]="S28.2E-2-2407-52400"; +channels[64]="S28.2E-2-2097-52400"; channelsnames[65]="ID+1"; -channels[65]="S28.2E-2-2407-52426"; +channels[65]="S28.2E-2-2097-52426"; channelsnames[66]="DMAX"; -channels[66]="S28.2E-2-2407-52415"; +channels[66]="S28.2E-2-2097-52415"; channelsnames[67]="DMAX+1"; -channels[67]="S28.2E-2-2407-52420"; +channels[67]="S28.2E-2-2097-52420"; channelsnames[68]="QUEST"; channels[68]="S28.2E-2-2009-6211"; channelsnames[69]="QUEST+1"; -channels[69]="S28.2E-2-2407-52430"; +channels[69]="S28.2E-2-2097-52430"; channelsnames[70]="Animal Planet"; channels[70]="S28.2E-2-2009-6202"; channelsnames[71]="Animal Plnt+1"; -channels[71]="S28.2E-2-2407-52405"; +channels[71]="S28.2E-2-2097-52405"; channelsnames[72]="Eden"; channels[72]="S28.2E-2-2006-6502"; channelsnames[73]="Eden+1"; @@ -216,10 +216,10 @@ channelsnames[112]="TCM"; channels[112]="S28.2E-2-2023-5714"; channelsnames[113]="TCM+1"; channels[113]="S28.2E-2-2301-52175"; -channelsnames[114]="Movies 24"; -channels[114]="S28.2E-2-2303-52265"; -channelsnames[115]="Movies 24+"; -channels[115]="S28.2E-2-2303-52270"; +channelsnames[114]="Christmas 24"; +channels[114]="S28.2E-2-2109-52265"; +channelsnames[115]="Christmas 24+"; +channels[115]="S28.2E-2-2109-52270"; channelsnames[116]="HBO"; channels[116]="S23.5E-3-3209-13104"; channelsnames[117]="HBO 2"; @@ -251,9 +251,9 @@ channels[150]="S19.2E-133-1-27"; channelsnames[151]="RTLNITRO"; channels[151]="S19.2E-1-1089-12061"; channelsnames[152]="Universal"; -channels[152]="S28.2E-2-2303-52255"; +channels[152]="S28.2E-2-2109-52255"; channelsnames[153]="Universal+1"; -channels[153]="S28.2E-2-2303-52220"; +channels[153]="S28.2E-2-2109-52220"; channelsnames[154]="ComedyCentral"; channels[154]="S28.2E-2-2069-51084"; channelsnames[155]="ComedyCent+1"; @@ -271,9 +271,9 @@ channels[160]="S28.2E-2-2006-6506"; channelsnames[161]="Dave ja vu"; channels[161]="S28.2E-2-2015-7624"; channelsnames[162]="Syfy"; -channels[162]="S28.2E-2-2303-52250"; +channels[162]="S28.2E-2-2109-52250"; channelsnames[163]="Syfy +1"; -channels[163]="S28.2E-2-2303-52280"; +channels[163]="S28.2E-2-2109-52280"; channelsnames[164]="alibi"; channels[164]="S28.2E-2-2006-6521"; channelsnames[165]="alibi +1"; @@ -656,19 +656,19 @@ channelsnames[476]="Disney Cinemagic,DisneyCin"; channels[476]="S19.2E-133-3-25"; channelsnames[477]="MGM"; channels[477]="S19.2E-133-3-515"; -channelsnames[478]="Sky Action,Action"; +channelsnames[478]="Sky Action OBSOLETE,Action"; channels[478]="S19.2E-133-2-9"; channelsnames[479]="Sky Atlantic,Atlantic"; channels[479]="S19.2E-133-17-34"; -channelsnames[480]="Sky Cinema+1,SkyCine1"; +channelsnames[480]="Sky Cinema+1 OBSOLETE,SkyCine1"; channels[480]="S19.2E-133-2-11"; -channelsnames[481]="Sky Cinema+24,SkyCine24"; +channelsnames[481]="Sky Cinema+24 OBSOLETE,SkyCine24"; channels[481]="S19.2E-133-2-43"; -channelsnames[482]="Sky Cinema,Cinema"; +channelsnames[482]="Sky Cinema OBSOLETE,Cinema"; channels[482]="S19.2E-133-2-10"; -channelsnames[483]="Sky Comedy,Comedy"; +channelsnames[483]="Sky Comedy OBSOLETE,Comedy"; channels[483]="S19.2E-133-2-8"; -channelsnames[484]="Sky Emotion,Emotion"; +channelsnames[484]="Sky Emotion OBSOLETE,Emotion"; channels[484]="S19.2E-133-2-20"; channelsnames[485]="Sky Nostalgie,Nostalgie"; channels[485]="S19.2E-133-3-516"; @@ -728,62 +728,60 @@ channelsnames[534]="Rai 4"; channels[534]="S13.0E-318-12400-8514"; channelsnames[535]="Rai Movie"; channels[535]="S13.0E-318-12400-8502"; -channelsnames[550]="Dubai Sports 3"; -channels[550]="S13.0E-318-5103-9502"; -channelsnames[551]="Rai Sport 1"; -channels[551]="S13.0E-318-5400-3305"; -channelsnames[552]="Rai Sport 2"; -channels[552]="S13.0E-318-5400-3301"; -channelsnames[553]="Eurosport Deutschland"; -channels[553]="S19.2E-1-1091-31200"; -channelsnames[554]="e8 television,e8 tv"; -channels[554]="S19.2E-133-33-897"; -channelsnames[555]="SPORT1"; -channels[555]="S19.2E-133-33-900"; +channelsnames[550]="Rai Sport 1"; +channels[550]="S13.0E-318-5400-3305"; +channelsnames[551]="Rai Sport 2"; +channels[551]="S13.0E-318-5400-3301"; +channelsnames[552]="Eurosport Deutschland"; +channels[552]="S19.2E-1-1091-31200"; +channelsnames[553]="SPORT1"; +channels[553]="S19.2E-133-33-900"; +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"; channels[556]="S28.2E-2-2023-5713"; channelsnames[557]="Eurosport 2"; channels[557]="S28.2E-2-2023-5009"; channelsnames[558]="Eurosport 2 BE"; channels[558]="S19.2E-53-1119-12900"; -channelsnames[559]="Ahlulbayt TV"; -channels[559]="S28.2E-2-2311-52080"; -channelsnames[560]="Premier Sports"; -channels[560]="S28.2E-2-2081-51113"; -channelsnames[561]="Sky Sports 1"; -channels[561]="S28.2E-2-2021-4214"; -channelsnames[562]="Sky Sports 2"; -channels[562]="S28.2E-2-2021-4208"; -channelsnames[563]="Sky Sports 3"; -channels[563]="S28.2E-2-2021-4219"; -channelsnames[564]="Sky Sports 4"; -channels[564]="S28.2E-2-2023-5401"; -channelsnames[565]="Sky Sp NewsHQ"; -channels[565]="S28.2E-2-2023-4907"; -channelsnames[566]="CANAL+ SPORT"; -channels[566]="S19.2E-1-1072-8224"; -channelsnames[567]="ESP Int'l"; -channels[567]="S13.0E-318-200-13831"; -channelsnames[568]="ESP Dutch"; -channels[568]="S13.0E-318-200-13833"; -channelsnames[569]="ESP2 Int'l"; -channels[569]="S13.0E-318-200-13801"; -channelsnames[570]="Eurosport 1HD NL"; -channels[570]="S23.5E-3-3222-21217"; -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]="Sport1 Select HD"; -channels[575]="S23.5E-3-3222-20960"; -channelsnames[576]="Sport1 Voetbal"; -channels[576]="S23.5E-3-3222-20925"; -channelsnames[577]="Sport1 Golf"; -channels[577]="S23.5E-3-3222-20930"; +channelsnames[559]="Premier Sports"; +channels[559]="S28.2E-2-2081-51113"; +channelsnames[560]="Sky Sports 1"; +channels[560]="S28.2E-2-2021-4214"; +channelsnames[561]="Sky Sports 2"; +channels[561]="S28.2E-2-2021-4208"; +channelsnames[562]="Sky Sports 3"; +channels[562]="S28.2E-2-2021-4219"; +channelsnames[563]="Sky Sports 4"; +channels[563]="S28.2E-2-2023-5401"; +channelsnames[564]="Sky Sp NewsHQ"; +channels[564]="S28.2E-2-2023-4907"; +channelsnames[565]="CANAL+ SPORT"; +channels[565]="S19.2E-1-1072-8224"; +channelsnames[566]="ESP Int'l"; +channels[566]="S13.0E-318-200-13831"; +channelsnames[567]="ESP Dutch"; +channels[567]="S13.0E-318-200-13833"; +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[600]="DELUXE MUSIC,DELUXE"; channels[600]="S19.2E-133-7-65"; channelsnames[601]="Vintage TV"; @@ -824,26 +822,26 @@ channelsnames[618]="MTV Music 24"; channels[618]="S19.2E-1-1078-28671"; channelsnames[619]="NOW Music"; channels[619]="S28.2E-2-2311-52010"; -channelsnames[620]="Blissmas"; -channels[620]="S28.2E-2-2110-53305"; -channelsnames[621]="Flava"; -channels[621]="S28.2E-2-2110-53300"; -channelsnames[622]="The Vault"; -channels[622]="S28.2E-2-2110-53355"; -channelsnames[623]="Chart Show TV"; -channels[623]="S28.2E-2-2110-53365"; -channelsnames[624]="Starz TV"; -channels[624]="S28.2E-2-2110-53335"; -channelsnames[625]="Planet Pop"; -channels[625]="S28.2E-2-2612-55114"; -channelsnames[626]="Chartshw Dnce"; -channels[626]="S28.2E-2-2110-53315"; +channelsnames[620]="Flava"; +channels[620]="S28.2E-2-2110-53300"; +channelsnames[621]="Dancember"; +channels[621]="S28.2E-2-2110-53315"; +channelsnames[622]="Starz TV"; +channels[622]="S28.2E-2-2110-53335"; +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"; +channels[625]="S28.2E-2-2095-55111"; +channelsnames[626]="CAPITAL TV"; +channels[626]="S28.2E-2-2095-55112"; channelsnames[627]="Clubland TV"; -channels[627]="S28.2E-2-2612-55113"; +channels[627]="S28.2E-2-2095-55113"; channelsnames[628]="Zing"; -channels[628]="S28.2E-2-2405-50470"; +channels[628]="S28.2E-2-2103-50470"; channelsnames[629]="Brit Asia TV"; -channels[629]="S28.2E-2-2612-55108"; +channels[629]="S28.2E-2-2316-53588"; channelsnames[630]="Kerrang!"; channels[630]="S28.2E-2-2040-12015"; channelsnames[631]="VH1."; @@ -1346,7 +1344,7 @@ channelsnames[1463]="Spiegel Geschichte HD,Spiegel G HD"; channels[1463]="S19.2E-133-8-137"; channelsnames[1464]="Syfy HD"; channels[1464]="S19.2E-133-12-126"; -channelsnames[1465]="TNT Glitz HD"; +channelsnames[1465]="TNT Glitz HD OBSOLETE"; channels[1465]="S19.2E-133-8-136"; channelsnames[1466]="TNT Serie HD,TNTSerieHD"; channels[1466]="S19.2E-133-11-123"; @@ -2030,7 +2028,7 @@ channelsnames[3239]="K75 International"; channels[3239]="S5.0E-85-2-260"; channelsnames[3240]="Dozhd TV"; channels[3240]="S5.0E-85-2-270"; -channelsnames[3241]="Espreso TV"; +channelsnames[3241]="Espreso TV OBSOLETE"; channels[3241]="S5.0E-85-2-280"; channelsnames[3242]="Viasat Sport Sverige"; channels[3242]="S5.0E-86-4-2100"; @@ -2592,7 +2590,7 @@ channelsnames[4024]="Polsat News 2"; channels[4024]="S13.0E-113-13200-13107"; channelsnames[4025]="BBC HD"; channels[4025]="S13.0E-318-11600-3590"; -channelsnames[4026]="BBC BRIT"; +channelsnames[4026]="BBC BRIT OBSOLETE"; channels[4026]="S13.0E-318-13000-14602"; channelsnames[4029]="TVN 24"; channels[4029]="S13.0E-318-1000-4312"; @@ -2888,7 +2886,7 @@ channelsnames[4704]="Comedy Central Polska."; channels[4704]="S13.0E-318-12800-30"; channelsnames[4705]="VIVA Polska.."; channels[4705]="S13.0E-318-12800-45"; -channelsnames[4706]="BBC earth"; +channelsnames[4706]="BBC earth OBSOLETE"; channels[4706]="S13.0E-318-13000-14603"; channelsnames[4707]="BBC Lifestyle"; channels[4707]="S13.0E-318-13000-14604"; @@ -3140,44 +3138,66 @@ channelsnames[6029]="redhot amateur"; channels[6029]="S28.2E-2-2092-55235"; channelsnames[6030]="Television X"; channels[6030]="S28.2E-2-2092-55231"; -channelsnames[6031]="DORCEL TV"; -channels[6031]="S19.2E-1-1110-9508"; -channelsnames[6032]="Vivid CZ"; -channels[6032]="S19.2E-53-1105-4065"; -channelsnames[6033]="XXL"; -channels[6033]="S19.2E-1-1094-17024"; -channelsnames[6034]="Hustler HD CZ"; -channels[6034]="S23.5E-3-3211-20831"; -channelsnames[6035]="Redlight"; -channels[6035]="S13.0E-318-5000-13760"; -channelsnames[6036]="Brazzers TV CZ"; -channels[6036]="S23.5E-3-3221-5069"; -channelsnames[6037]="Hustler TV CZ"; -channels[6037]="S19.2E-53-1119-12884"; -channelsnames[6038]="FL TV"; -channels[6038]="S13.0E-318-15400-13512"; -channelsnames[6039]="DORCEL XXX"; -channels[6039]="S19.2E-1-1096-8601"; -channelsnames[6040]="XXL"; -channels[6040]="S19.2E-1-1094-17054"; -channelsnames[6041]="Hustler HD"; -channels[6041]="S23.5E-3-3211-20830"; -channelsnames[6042]="XXL"; -channels[6042]="S13.0E-319-9900-468"; -channelsnames[6043]="Redlight HD!"; -channels[6043]="S13.0E-318-15800-16943"; -channelsnames[6044]="Hustler HD!"; -channels[6044]="S13.0E-318-15800-16944"; -channelsnames[6045]="XXL PL"; -channels[6045]="S13.0E-319-9900-469"; -channelsnames[6046]="Penthouse HD"; -channels[6046]="S23.5E-3-3236-5711"; -channelsnames[6047]="Penthouse HD1"; -channels[6047]="S23.5E-3-3236-5712"; -channelsnames[6048]="Penthouse HD2"; -channels[6048]="S23.5E-3-3236-5713"; -channelsnames[6049]="Penthouse 3D"; -channels[6049]="S23.5E-3-3204-5311"; +channelsnames[6031]="redhot mums"; +channels[6031]="S28.2E-2-2092-55239"; +channelsnames[6032]="TVX Brits"; +channels[6032]="S28.2E-2-2092-55244"; +channelsnames[6033]="Climax"; +channels[6033]="S28.2E-2-2316-53592"; +channelsnames[6034]="ExGirlfriends"; +channels[6034]="S28.2E-2-2316-53597"; +channelsnames[6035]="XXX Mums"; +channels[6035]="S28.2E-2-2011-5708"; +channelsnames[6036]="XXX Brits"; +channels[6036]="S28.2E-2-2011-5710"; +channelsnames[6037]="XXXUniforms"; +channels[6037]="S28.2E-2-2019-5703"; +channelsnames[6038]="XXX Amateurs"; +channels[6038]="S28.2E-2-2019-4020"; +channelsnames[6039]="XXX Girl Girl"; +channels[6039]="S28.2E-2-2019-4021"; +channelsnames[6040]="xxx big&bouncy"; +channels[6040]="S28.2E-2-2019-4023"; +channelsnames[6041]="XXX 18 & Dirty"; +channels[6041]="S28.2E-2-2019-5704"; +channelsnames[6042]="DORCEL TV"; +channels[6042]="S19.2E-1-1110-9508"; +channelsnames[6043]="Vivid CZ"; +channels[6043]="S19.2E-53-1105-4065"; +channelsnames[6044]="XXL"; +channels[6044]="S19.2E-1-1094-17024"; +channelsnames[6045]="Hustler HD CZ"; +channels[6045]="S23.5E-3-3211-20831"; +channelsnames[6046]="Redlight"; +channels[6046]="S13.0E-318-5000-13760"; +channelsnames[6047]="Brazzers TV CZ"; +channels[6047]="S23.5E-3-3221-5069"; +channelsnames[6048]="Hustler TV CZ"; +channels[6048]="S19.2E-53-1119-12884"; +channelsnames[6049]="FL TV"; +channels[6049]="S13.0E-318-15400-13512"; +channelsnames[6050]="DORCEL XXX"; +channels[6050]="S19.2E-1-1096-8601"; +channelsnames[6051]="XXL"; +channels[6051]="S19.2E-1-1094-17054"; +channelsnames[6052]="Hustler HD"; +channels[6052]="S23.5E-3-3211-20830"; +channelsnames[6053]="XXL"; +channels[6053]="S13.0E-319-9900-468"; +channelsnames[6054]="Redlight HD!"; +channels[6054]="S13.0E-318-15800-16943"; +channelsnames[6055]="Hustler HD!"; +channels[6055]="S13.0E-318-15800-16944"; +channelsnames[6056]="XXL PL"; +channels[6056]="S13.0E-319-9900-469"; +channelsnames[6057]="Penthouse HD"; +channels[6057]="S23.5E-3-3236-5711"; +channelsnames[6058]="Penthouse HD1"; +channels[6058]="S23.5E-3-3236-5712"; +channelsnames[6059]="Penthouse HD2"; +channels[6059]="S23.5E-3-3236-5713"; +channelsnames[6060]="Penthouse 3D"; +channels[6060]="S23.5E-3-3204-5311"; channelsnames[8001]="NPO 1"; channels[8001]="T-8720-2214-1101"; channelsnames[8002]="NPO 2"; @@ -3345,17 +3365,21 @@ channels[9050]="S23.5E-3-3211-20892"; channelsnames[9051]="ROCK ANTENNE,ROCK ANT"; channels[9051]="S19.2E-133-7-160"; channelsnames[9052]="Planet Rock"; -channels[9052]="S28.2E-2-2075-9575"; -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"; -channels[9055]="S19.2E-1-1093-28481"; -channelsnames[9056]="ANTENNE BAYERN,ANTENNE"; -channels[9056]="S19.2E-133-7-170"; -channelsnames[9057]="radio top40"; -channels[9057]="S19.2E-1-1113-12653"; +channels[9052]="S28.2E-2-2095-9575"; +channelsnames[9053]="Classic Rock"; +channels[9053]="S28.2E-2-2104-55375"; +channelsnames[9054]="RADIO BEAT"; +channels[9054]="S23.5E-3-3219-13159"; +channelsnames[9055]="Rock Classic"; +channels[9055]="S13.0E-64511-100-15375"; +channelsnames[9056]="1LIVE"; +channels[9056]="S19.2E-1-1093-28475"; +channelsnames[9057]="1LIVE diGGi"; +channels[9057]="S19.2E-1-1093-28481"; +channelsnames[9058]="ANTENNE BAYERN,ANTENNE"; +channels[9058]="S19.2E-133-7-170"; +channelsnames[9059]="radio top40"; +channels[9059]="S19.2E-1-1113-12653"; channelsnames[9100]="SRG-SRF 1"; channels[9100]="S13.0E-318-8500-921"; channelsnames[9101]="SRG-SRF 2 Kultur"; @@ -3465,7 +3489,7 @@ minChan[5] = 5001; maxChan[5] = 5100; baseChn[5] = 5000; minChan[6] = 6001; -maxChan[6] = 6049; +maxChan[6] = 6060; baseChn[6] = 6000; minChan[8] = 8001; maxChan[8] = 8059; @@ -3484,4 +3508,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 = "11/15/15 21:54:39" ; +Chan_Ver = "12/10/15 22:56:11" ; diff --git a/javascript/main.js b/javascript/main.js index 3ac58be..d7bc1c6 100644 --- a/javascript/main.js +++ b/javascript/main.js @@ -547,7 +547,7 @@ function play(uri) { URL = uri; initialDelayPlayID = setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",initialDelayPlay); initialDelayPlay = initialDelayPlayTime; - PlayDelayID = setTimeout("initialDelayPlay = 0;",5000); + PlayDelayID = setTimeout("initialDelayPlay = 0;",initialDelayPlayNormal); SetLed(1,1,0); if(isFullscreen) { showOSD(); } @@ -1056,6 +1056,7 @@ function onKeyDown(event) { } MenuOff(1); menu = 0; + menuitem = 0; InitMenu(menu); } break; @@ -2380,8 +2381,9 @@ function onKeyMenu(keyCode) { } else if (menu == 12) { newsID -= 1; InitMenu(menu); - } - + } else if (menu == MainMenu) { + menuitem -= 1; if (menuitem < 0) { menuitem = 0}; + } epg_unactive(); InitMenu(menu); break; @@ -2396,8 +2398,9 @@ function onKeyMenu(keyCode) { } else if (menu == 12) { newsID += 1; InitMenu(menu); - } - + } else if (menu == MainMenu) { + menuitem += 1; if (menuitem > 9) { menuitem = 9}; + } epg_unactive(); InitMenu(menu); break; @@ -3556,7 +3559,7 @@ function MPD(ev) { if (MPDListener == 0) { if (ev.state == 6 ) { if (ev.reason == "CommandClose" && ErrorAgain == 0) { - setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",500); + setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",initialDelayPlay); ErrorAgain = 1; } else if (KeepTrying) { ErrorAgain = 0; diff --git a/javascript/settings.js b/javascript/settings.js index f056aff..b3ed2f4 100644 --- a/javascript/settings.js +++ b/javascript/settings.js @@ -182,6 +182,7 @@ var DelisOK = 0; var recPath = "/recordings.xml"; var menu = 0; +var menuitem = 0; var isMediaMenu = 0; var isVisible = 0; var isSetupMenu = 0; @@ -310,6 +311,7 @@ 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; var SleepTimer = 0; -- cgit v1.2.3