From 89b4572fa03898cd1499df4ea44ec1475c347469 Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Thu, 5 Sep 2013 19:52:37 +0200 Subject: Update Channels More info for SearchTimers More info during playback --- channels.js | 2 +- index.html | 31 ++++++++++++++++++++++++++----- lang_dut.js | 1 + lang_eng.js | 2 ++ 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/channels.js b/channels.js index e50a9dd..a434882 100644 --- a/channels.js +++ b/channels.js @@ -827,7 +827,7 @@ channels[592] = "S19.2E-133-3-17"; channelsnames[600] = "DELUXE MUSIC (S)"; channels[600] = "S19.2E-133-7-65"; channelsnames[601] = "Vintage TV (S)"; -channels[601] = "S28.2E-2-2603-54222"; +channels[601] = "S28.2E-2-2301-52180"; channelsnames[602] = "XITE (T)"; channels[602] = "T-8720-2244-43"; channelsnames[603] = "MTV (T)"; diff --git a/index.html b/index.html index cbc6b32..64521ca 100644 --- a/index.html +++ b/index.html @@ -20,7 +20,7 @@ // // -var Version = "0.22.4" +var Version = "0.22.5" for (var x = 0; x < 10; x++) { searchtimers[x] = "" ; // To solve displaying undefined @@ -2453,6 +2453,21 @@ try { } else { SearchTimer[i] = SearchTimer[i] + "\uE003\uE016\uE003" + Lang[41] + "\uE003" + "\n"; } + if ((x[i].getElementsByTagName("use_dayofweek")[0].childNodes[0].nodeValue) == 0) { + SearchTimer[i] = SearchTimer[i] + "\uE003\uE016\uE003" + Lang[47] + "\uE003" + "\n"; + } else { + //bit is used for dayofweek. + var dowx = Math.abs(x[i].getElementsByTagName("dayofweek")[0].childNodes[0].nodeValue); + var dow = ""; + for (var dowi=0; dowi<7; dowi++) + { + var mask = 1 << dowi; + if ((dowx & mask) != 0) { dow = dow + days[dowi] + "\uE003";} + } + SearchTimer[i] = SearchTimer[i] + "\uE003\uE017\uE003" + Lang[47] + "\uE003:\uE003" + dow + "\n"; + } + + if ((x[i].getElementsByTagName("use_channel")[0].childNodes[0].nodeValue) == 0) { SearchTimer[i] = SearchTimer[i] + "\uE003\uE016\uE003" + Lang[42] + "\uE003" + "\n"; } else { @@ -2460,6 +2475,7 @@ try { searchchan[(x[i].getElementsByTagName("use_channel")[0].childNodes[0].nodeValue)] + "\uE003" + x[i].getElementsByTagName("channels")[0].childNodes[0].nodeValue + "\n"; } + SearchTimer[i] = SearchTimer[i] + "\n"; // End of Extended INFO @@ -2595,6 +2611,7 @@ function UnloadMediaSettings() { mediaPlayer.removeEventListener(mediaPlayer.ON_STATE_CHANGED, onStateChanged); mediaList.style.opacity = 0; osdmedia.style.opacity = 0; + osdtime.style.opacity = 0; osdepginfo.style.opacity = 0; mediaList.innerHTML = "

" + Lang[0] + "

"; showDisplay((currChan.toString()), false, 100, 0 ); @@ -2799,6 +2816,7 @@ if (DelisOK) { break; case "Accept": osdmedia.style.opacity = 1 - osdmedia.style.opacity; + osdtime.style.opacity = osdmedia.style.opacity; ShowMediaOSD(); break; case "Green": @@ -3282,6 +3300,7 @@ function AddInfo(info) { function showMediaList() { if (osdepginfo.style.opacity == 1) {osdepginfo.style.opacity = 0;} osdmedia.style.opacity = 0; + osdtime.style.opacity = 0; var liststyle = ""; listMed = currMed - 1; var MaxMed = -1; @@ -3716,7 +3735,9 @@ function ShowMediaOSD() { pos4 = pos4 + "" + pos6 + ""; var x = (Number(recDura[currMed])/60).toFixed(0); if (pos/60 > x) { x = (pos/60).toFixed(0);} - osdmedia.innerHTML = "
  " + (pos/60).toFixed(0) + " / " + x + "  " + Left(recTitl[currMed],40) + "\n  " + pos4 + "
"; + date_time(); + osdtime.innerHTML = result; + osdmedia.innerHTML = "
 \n  " + (pos/60).toFixed(0) + " / " + x + "  " + Left(recTitl[currMed],40) + "\n  " + pos4 + "
"; } function ShowInfo() { @@ -3849,9 +3870,9 @@ function ClearScreen() {
Volume :
-
+
-
+
@@ -3868,7 +3889,7 @@ function ClearScreen() {
-
+
diff --git a/lang_dut.js b/lang_dut.js index a25df9a..4a009f3 100755 --- a/lang_dut.js +++ b/lang_dut.js @@ -76,6 +76,7 @@ Lang[40] = "Gebruik als zoektimer"; Lang[41] = "Gebruik Tijd"; Lang[42] = "Channel Mode"; Lang[43] = " Problemen met het opvragen van ZoekTimers "; +Lang[47] = "Gebruik dag van de week"; Lang[44] = " OK om te wissen "; Lang[45] = " andere toets om dit niet te doen "; diff --git a/lang_eng.js b/lang_eng.js index 43221a4..23453ee 100755 --- a/lang_eng.js +++ b/lang_eng.js @@ -76,11 +76,13 @@ Lang[40] = "Use as Search Timer"; Lang[41] = "Use Time"; Lang[42] = "Channel Mode"; Lang[43] = " ERROR Getting SearchTimers from "; +Lang[47] = "Use day of the week"; Lang[44] = " OK to delete "; Lang[45] = " other to abort "; Lang[46] = "free "; + Lang[50] = " Server EPG "; Lang[51] = " ERROR getting Server EPG !!! "; Lang[52] = " NO EPG on this channel!!! "; -- cgit v1.2.3