From c8af05a1440c949c81dbc46873eae6be768cdb07 Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Tue, 17 Sep 2013 12:44:52 +0200 Subject: Error message not only on the frontdisplay but also on OSD --- History | 5 ++++- channels6.js | 24 ++++++++++++------------ channels9.js | 42 +++++++++++++++++++++--------------------- index.html | 20 ++++++++++++-------- lang_dut.js | 3 ++- lang_eng.js | 4 +++- 6 files changed, 54 insertions(+), 44 deletions(-) diff --git a/History b/History index 49995e2..ccb2407 100644 --- a/History +++ b/History @@ -3,7 +3,10 @@ Motorola Vip : 1960, 1910, 1903, 1963. VDR 1.7.29 -0.23 +0.23 Infobox for connection Error, not only ERRR on display but also the Infobox + + + 0.22 Updated EPG filter for 42E, canal sat (tid 1088), canal+ (tid 1060), CDS (veronica, iConcerts, Animax) Fix: Right month is now shown in recordings menu. diff --git a/channels6.js b/channels6.js index a7ea2f4..ec0e97d 100644 --- a/channels6.js +++ b/channels6.js @@ -56,8 +56,8 @@ channelsnames[6025] = "DORCEL TV (S)"; channels[6025]="S19.2E-1-1094-17059"; channelsnames[6026] = "PRIVATE SPICE (S)"; channels[6026]="S19.2E-1-1096-8613"; -//channelsnames[6027] = "Hustler TV CZ (S)"; -//channels[6027]="S19.2E-53-1097-2043"; +channelsnames[6027] = "Hustler TV CZ (S)"; +channels[6027]="S19.2E-53-1119-12884"; channelsnames[6028] = "XXL (S)"; channels[6028]="S13.0E-319-9900-468"; channelsnames[6029] = "SCT HD (S)"; @@ -68,14 +68,14 @@ channelsnames[6032] = "EROX (S)"; channels[6032]="S23.5E-3-3212-14052"; channelsnames[6034] = "EROXXX (S)"; channels[6034]="S23.5E-3-3212-14055"; -channelsnames[6035] = "Penthouse 3D HD (S)"; -channels[6035]="S23.5E-3-3204-5311"; +//channelsnames[6035] = "Penthouse 3D HD (S)"; +//channels[6035]="S23.5E-3-3204-5311"; //channelsnames[6035] = "Penthouse HD (S)"; //channels[6035]="S23.5E-3-3236-5711"; -channelsnames[6036] = "Penthouse HD1 (S)"; -channels[6036]="S23.5E-3-3236-5712"; -channelsnames[6037] = "Penthouse HD2 (S)"; -channels[6037]="S23.5E-3-3236-5713"; +//channelsnames[6036] = "Penthouse HD1 (S)"; +//channels[6036]="S23.5E-3-3236-5712"; +//channelsnames[6037] = "Penthouse HD2 (S)"; +//channels[6037]="S23.5E-3-3236-5713"; channelsnames[6038] = "Private Spice (S)"; channels[6038]="S23.5E-3-3202-6072"; channelsnames[6039] = "Penthouse HD (S)"; @@ -84,10 +84,10 @@ channelsnames[6040] = "HUSTLER HD-3D (S)"; channels[6040]="S13.0E-318-15800-16933"; channelsnames[6041] = "DARING TV (S)"; channels[6041]="S13.0E-318-13300-4960"; -channelsnames[6043]="Playboy TV (S)"; -channels[6043]="S13.0E-318-12100-7513"; -channelsnames[6044]="Blue Hustler (S)"; -channels[6044]="S13.0E-113-7900-10516"; +//channelsnames[6043]="Playboy TV (S)"; +//channels[6043]="S13.0E-318-12100-7513"; +//channelsnames[6044]="Blue Hustler (S)"; +//channels[6044]="S13.0E-113-7900-10516"; channelsnames[6045]="Beate-Uhse.TV (S)"; channels[6045]="S19.2E-133-17-21"; channelsnames[6047]="PENTHOUSE HD (S)"; diff --git a/channels9.js b/channels9.js index d93f485..b3d8b5c 100644 --- a/channels9.js +++ b/channels9.js @@ -18,10 +18,10 @@ channelsnames[9003] = "NL-3FM (S)"; channels[9003] = "S19.2E-1-1037-5283"; channelsnames[9004] = "NL-Radio 4 (S)"; channels[9004] = "S19.2E-1-1037-5284"; -//channelsnames[9005] = "NL-Radio 5 (S)"; -//channels[9005] = "S19.2E-53-1097-2059"; -//channelsnames[9006] = "NL-Radio 6 (S)"; -//channels[9006] = "S19.2E-53-1097-2060"; +channelsnames[9005] = "NL-Radio 5 (S)"; +channels[9005] = "S19.2E-1-1037-5285"; +channelsnames[9006] = "NL-Radio 6 (S)"; +channels[9006] = "S19.2E-1-1037-5286"; channelsnames[9007] = "Radio Oost (S)"; channels[9007] = "S23.5E-3-3211-20844"; channelsnames[9008] = "Radio Gelderland (S)"; @@ -40,16 +40,16 @@ channels[9009] = "S19.2E-53-1105-4030"; //channels[9014] = "S19.2E-53-1097-2069"; //channelsnames[9015] = "Slam FM (S)"; //channels[9015] = "S19.2E-53-1097-2071"; -channelsnames[9016] = "Studio Brussel (S)"; -channels[9016] = "S19.2E-53-1119-12781"; -channelsnames[9017] = "Klara (S)"; -channels[9017] = "S19.2E-53-1119-12782"; -channelsnames[9018] = "Q-music (S)"; -channels[9018] = "S19.2E-53-1119-12786"; -channelsnames[9019] = "JOEfm (S)"; -channels[9019] = "S19.2E-53-1119-12787"; -channelsnames[9020] = "Nostalgie (S)"; -channels[9020] = "S19.2E-53-1119-12789"; +//channelsnames[9016] = "Studio Brussel (S)"; +//channels[9016] = "S19.2E-53-1119-12781"; +//channelsnames[9017] = "Klara (S)"; +//channels[9017] = "S19.2E-53-1119-12782"; +//channelsnames[9018] = "Q-music (S)"; +//channels[9018] = "S19.2E-53-1119-12786"; +//channelsnames[9019] = "JOEfm (S)"; +//channels[9019] = "S19.2E-53-1119-12787"; +//channelsnames[9020] = "Nostalgie (S)"; +//channels[9020] = "S19.2E-53-1119-12789"; channelsnames[9021] = "100% NL (S)"; channels[9021] = "S23.5E-3-3211-20890"; //channelsnames[9022] = "Arrow Jazz (S)"; @@ -71,19 +71,19 @@ channels[9021] = "S23.5E-3-3211-20890"; //channelsnames[9030] = "La Premiere (S)"; //channels[9030] = "S19.2E-53-1097-2089"; channelsnames[9031] = "FunX (S)"; -channels[9031] = "S19.2E-53-1105-4035"; +channels[9031] = "S19.2E-1-1037-5287"; //channelsnames[9032] = "RNW1 (S)"; //channels[9032] = "S19.2E-53-1105-4050"; //channelsnames[9033] = "RNW2 (S)"; //channels[9033] = "S19.2E-53-1105-4055"; //channelsnames[9034] = "RNW3 (S)"; //channels[9034] = "S19.2E-53-1105-4060"; -channelsnames[9035] = "VRT Radio1 (S)"; -channels[9035] = "S19.2E-53-1119-12778"; -channelsnames[9036] = "VRT Radio2 (S)"; -channels[9036] = "S19.2E-53-1119-12779"; -channelsnames[9037] = "MNM (S)"; -channels[9037] = "S19.2E-53-1119-12780"; +//channelsnames[9035] = "VRT Radio1 (S)"; +//channels[9035] = "S19.2E-53-1119-12778"; +//channelsnames[9036] = "VRT Radio2 (S)"; +//channels[9036] = "S19.2E-53-1119-12779"; +//channelsnames[9037] = "MNM (S)"; +//channels[9037] = "S19.2E-53-1119-12780"; channelsnames[9038] = "COUNTRY RADIO (S)"; channels[9038] = "S23.5E-3-3219-13150"; channelsnames[9039] = "Arrow Jazz (S)"; diff --git a/index.html b/index.html index 4260678..cd96b70 100644 --- a/index.html +++ b/index.html @@ -20,7 +20,7 @@ // // -var Version = "0.22" +var Version = "0.23.2" window.onkeydown = onKeyDown; @@ -466,7 +466,7 @@ function setOSDscale() { fsList = (18*Yfactor[Set_Res]) + "px"; fsSchedList = (18*Yfactor[Set_Res]) + "px"; fsSched = (26*Yfactor[Set_Res]) + "px"; - fsRec = (27*Yfactor[Set_Res]) + "px"; + fsRec = (35*Yfactor[Set_Res]) + "px"; fsReclist = (19*Yfactor[Set_Res]) + "px"; fsMedia = (27*Yfactor[Set_Res]) + "px"; fsKeys = (19*Yfactor[Set_Res]) + "px"; @@ -2400,8 +2400,8 @@ if(menu == 4) { // INFO Menu if(menu == 5) { // Timers from Server if (timerOK) { - booking = "
" + Lang[32] + "
"; - booking = booking + ""; + // booking = "
" + Lang[32] + "
"; + booking = ""; var x = timerID - 1; for (var i=0;i<11;i++) { if (maxTimers !== 0) { do { x = x + 1; } while (!timers[x] && (x < maxTimers)) } @@ -2417,8 +2417,7 @@ if(menu == 5) { // Timers from Server if(menu == 7) { // SearchTimers from Server if (timerOK) { // booking = "
" + Lang[32] + "
"; - booking = ""; - booking = booking + ""; + booking = ""; var x = timerID - 1; for (var i=0;i<11;i++) { if (maxTimers !== 0) { do { x = x + 1; } while (!searchtimers[x] && (x < maxTimers)) } @@ -2748,9 +2747,14 @@ function ShowSearchTimerInfo() { // MPD Section function MPD(ev) { - // alert("Media player state changed: state=" + ev.state + ", reason=" + ev.reason); // + ", code=" + ev.code); +// alert("Media player state changed: state=" + ev.state + ", reason=" + ev.reason); // + ", code=" + ev.code); if (MPDListener == 0) { - if (ev.state == 6 ) { showDisplay("ERRR", false, 100, 0 ); } + if (ev.state == 6 ) { + showDisplay("ERRR", false, 100, 0 ); + settimer(0,Lang[67],0,2); + switchtimer.style.opacity = 1; + setTimeout("switchtimer.style.opacity = 0; ", 5000); + } } else { if ( ev.state == 6 && ev.reason == "HostUnreachable" ) { diff --git a/lang_dut.js b/lang_dut.js index 97ade66..9c4b4f1 100755 --- a/lang_dut.js +++ b/lang_dut.js @@ -49,7 +49,7 @@ Lang[13] = " Server : Timers "; Lang[14] = " Server : EPG "; Lang[15] = " Server : Media Directory "; Lang[16] = " Server : ZoekTimers "; -Lang[17] = " MPD Server Verbinding "; +Lang[17] = " Server : MPD Verbinding "; Lang[18] = " Herstart Portal "; //Settings menu @@ -100,6 +100,7 @@ Lang[63] = " Opnieuw verbinden "; Lang[64] = " Verbonden met MPD server "; Lang[65] = " maar streaming gestopt "; Lang[66] = " Reden "; +Lang[67] = "Verbindings probleem"; Lang[70] = "Pause"; Lang[80] = "Toon KanaalGroep"; diff --git a/lang_eng.js b/lang_eng.js index f49dbbd..42b11ea 100755 --- a/lang_eng.js +++ b/lang_eng.js @@ -49,7 +49,7 @@ Lang[13] = " Server : Timers "; Lang[14] = " Server : EPG "; Lang[15] = " Server : Media Directory "; Lang[16] = " Server : SearchTimers "; -Lang[17] = " MPD Server Connection "; +Lang[17] = " Server : MPD Connection "; Lang[18] = " Restart Portal "; //Settings menu @@ -100,8 +100,10 @@ Lang[63] = " Reconnect "; Lang[64] = " Connected to MPD server "; Lang[65] = " but streaming ended "; Lang[66] = " Reason "; +Lang[67] = "Connection Error"; Lang[70] = "Pause"; Lang[80] = "Show ChannelsGroup"; Lang[81] = "Group "; Lang[82] = "Group Selection"; + -- cgit v1.2.3