summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--channels.js2
-rw-r--r--channels1.js2
-rw-r--r--index.html58
-rwxr-xr-xlang_dut.js3
-rwxr-xr-xlang_eng.js1
-rw-r--r--settings.js3
6 files changed, 46 insertions, 23 deletions
diff --git a/channels.js b/channels.js
index 133cde3..1c0ed98 100644
--- a/channels.js
+++ b/channels.js
@@ -65,6 +65,8 @@ channelsnames[14] = "Discovery (S)";
channels[14] = "S19.2E-1-1037-5252";
channelsnames[15] = "iConcerts (S)";
channels[15] = "S23.5E-3-3211-20823";
+channelsnames[16] = "SyFy Universal (S)";
+channels[16] = "S23.5E-53-1105-20822";
channelsnames[18] = "NG Wild DUT (S)";
channels[18] = "S23.5E-3-3210-5145";
//channelsnames[19] = "History channel DUT (S)";
diff --git a/channels1.js b/channels1.js
index 0faf26d..7fdfd28 100644
--- a/channels1.js
+++ b/channels1.js
@@ -10,7 +10,7 @@ baseChn[1] = 1000;
protChn[1] = 0;
channelsnames[1001] = "NED1 HD (S)"
-channels[1001] = "S23.5E-3-3208-7035"
+channels[1001] = "S23.5E-3-3208-21029"
channelsnames[1002] = "NED2 HD (S)"
channels[1002] = "S23.5E-3-3202-6080"
channelsnames[1003] = "NED3 HD (S)"
diff --git a/index.html b/index.html
index 6ad0bcc..a9b773b 100644
--- a/index.html
+++ b/index.html
@@ -20,7 +20,7 @@
//
//
-var Version = "0.23.4"
+var Version = "0.23.6"
window.onkeydown = onKeyDown;
@@ -165,6 +165,12 @@ function GetSettings() {
toi.informationService.setObject("vip.resolution","2",toi.informationService.STORAGE_PERMANENT)
}
+ try {
+ if (!toi.informationService.getObject("vip.testing2")) {}
+ } catch(e) {
+ toi.informationService.setObject("vip.testing2","0",toi.informationService.STORAGE_PERMANENT)
+ }
+
var sel_group;
for (var i=0;i<10;i++) {
@@ -194,6 +200,7 @@ function GetSettings() {
loadjs(langfile[lang_nr]);
experimental = Number(toi.informationService.getObject("vip.testing"));// Use some experimental code
+ testing2 = Number(toi.informationService.getObject("vip.testing2"));// Use some experimental code
Set_Res = Number(toi.informationService.getObject("vip.resolution"));
VideoOutput();
@@ -382,6 +389,19 @@ function play(uri) {
showOSD();
}
+ if(testing2) {
+ if ( (currChan > 10 && currChan < 26 ) || (currChan > 40 && currChan < 50 ) || (currChan > 50 && currChan < 120 ) ||
+ (currChan > 151 && currChan < 200) || (currChan > 604 && currChan < 612 ) || (currChan > 624 && currChan < 631) ||
+ (currChan > 632 && currChan < 700) || (currChan > 8004 && currChan < 8027) )
+ {
+ //Show info if set nonfree
+ switchtimer.innerHTML = "<pre><center>\n" + Lang[90] +"\n\n </center></pre>"; // Non free channel message
+ switchtimer.style.opacity = 1;
+ if (CAdelayID != -1) { clearTimeout(CAdelayID); CAdelayID = -1;}
+ CAdelayID = setTimeout("switchtimer.style.opacity = 0; ", (ShowSetTimer + ShowOsdTime) );
+ }
+ }
+
showDisplay((currChan.toString()), false, 100, 0 );
GetEPG(currChan);
} catch (e) {
@@ -670,8 +690,6 @@ function onKeyDown(event) {
} else if(isSchedule == 0){
if(NowNext) {
settimer(EPG[NowNext][2][currChan],EPG[NowNext][1][currChan],0,1);
- switchtimer.style.opacity = 1;
- setTimeout("switchtimer.style.opacity = 0; ", 2000);
}
}
break;
@@ -1022,8 +1040,6 @@ function onKeyDown(event) {
if(epgactive) {
ServerTimer(channels[currChan],EPG[NowNext][6][currChan]);
settimer(EPG[NowNext][2][currChan],EPG[NowNext][1][currChan],(EPG[NowNext][3][currChan]*60),2);
- switchtimer.style.opacity = 1;
- setTimeout("switchtimer.style.opacity = 0; ", 2000);
} else {
ServerRecordStart();
}
@@ -1036,8 +1052,6 @@ function onKeyDown(event) {
// // make timer for recording
// ServerTimer(channels[currChan],EPG[NowNext][6][currChan]);
// settimer(EPG[NowNext][2][currChan],EPG[NowNext][1][currChan],(EPG[NowNext][3][currChan]*60),2);
-// switchtimer.style.opacity = 1;
-// setTimeout("switchtimer.style.opacity = 0; ", 2000);
// } else {
// ServerRecordStart();
// }
@@ -1246,6 +1260,9 @@ function settimer(ProgTime,ProgName,ProgDura,SwitchTimer) {
switchtimer.innerHTML = "<pre>" + Lang[2] + Left(ProgName,30) + "\n" + Lang[3] + channelsnames[currChan] + "\n" + Lang[4] + th + ":" + tm + "</pre>";
setOSDtimer();
+ switchtimer.style.opacity = 1;
+ setTimeout("switchtimer.style.opacity = 0; ", ShowSetTimer);
+
}
@@ -1351,7 +1368,7 @@ function date_time_rec()
date = new Date(Number(recStrt[currMed])*1000);
year = date.getFullYear();
month = date.getMonth();
- month = addzero(month);
+ month = addzero(month + 1);
d = date.getDate();
d = addzero(d);
day = date.getDay();
@@ -1615,6 +1632,12 @@ function StreamInfo(si) {
is.setObject("cfg.locale.ui","tur",is.STORAGE_VOLATILE);
}
+ if(SI[0]=="S42.0E" && SI[3]=="3601") {
+ is.setObject("cfg.locale.ui","eng",is.STORAGE_VOLATILE);
+ }
+
+
+
if(SI[1]=="133") {
//sky deutchland
is.setObject("cfg.locale.ui","DEU",is.STORAGE_VOLATILE);
@@ -2091,6 +2114,11 @@ function onKeyMenu(keyCode) {
break;
case "Red":
+ if (menu == 0) {
+ window.open("http://www.google.com");
+ break;
+ }
+
if (menu == 2) {
var x = toi.schedulerService.getBookingIds("*", 0, 0);
if (x.length > 0) {
@@ -2863,8 +2891,6 @@ if (MPDListener == 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 {
@@ -3034,8 +3060,6 @@ if (DelisOK) {
}
if (getRecOK == 2) { //set timer
settimer(recStrt[currMed],recTitl[currMed],recDura[currMed],1);
- switchtimer.style.opacity = 1;
- setTimeout("switchtimer.style.opacity = 0; ", 2000);
}
break;
case "Blue":
@@ -3048,8 +3072,6 @@ if (DelisOK) {
case "Green":
if (getRecOK == 2) { //set timer
settimer(recStrt[currMed],recTitl[currMed],recDura[currMed],3);
- switchtimer.style.opacity = 1;
- setTimeout("switchtimer.style.opacity = 0; ", 2000);
}
break;
@@ -3082,8 +3104,6 @@ if (DelisOK) {
if (getRecOK == 2) { //set timer
settimer(recStrt[currMed],recTitl[currMed],recDura[currMed],2);
ServerTimer(channels[currChan],recGUID[currMed]);
- switchtimer.style.opacity = 1;
- setTimeout("switchtimer.style.opacity = 0; ", 2000);
}
break;
case KEY_0:
@@ -3884,12 +3904,8 @@ function ServerRecordStart() {
if (xmlhttp.responseXML == null) {
settimer(EPG[NowNext][2][currChan],Lang[55],0,2);
- switchtimer.style.opacity = 1;
- setTimeout("switchtimer.style.opacity = 0; ", 2000);
} else {
settimer(EPG[NowNext][2][currChan],EPG[NowNext][1][currChan],0,2);
- switchtimer.style.opacity = 1;
- setTimeout("switchtimer.style.opacity = 0; ", 2000);
}
} catch(e) {
@@ -3911,8 +3927,6 @@ function ServerPause() {
//Show some info on screen
settimer(EPG[NowNext][2][currChan],Lang[70],0,2);
- switchtimer.style.opacity = 1;
- setTimeout("switchtimer.style.opacity = 0; ", 7000);
} catch(e) {
alert("Sending Pause key to server problem: " + e);
diff --git a/lang_dut.js b/lang_dut.js
index fe881b3..26a9c84 100755
--- a/lang_dut.js
+++ b/lang_dut.js
@@ -110,3 +110,6 @@ Lang[70] = "Pause";
Lang[80] = "Toon KanaalGroep";
Lang[81] = "Groep ";
Lang[82] = "Groep Selektie";
+
+Lang[90] = "Deze zender zit niet in je pakket";
+
diff --git a/lang_eng.js b/lang_eng.js
index 0208135..2e13018 100755
--- a/lang_eng.js
+++ b/lang_eng.js
@@ -110,3 +110,4 @@ Lang[80] = "Show ChannelsGroup";
Lang[81] = "Group ";
Lang[82] = "Group Selection";
+Lang[90] = "No subscription for this channel";
diff --git a/settings.js b/settings.js
index 6d87eab..b60aa9f 100644
--- a/settings.js
+++ b/settings.js
@@ -14,6 +14,7 @@ var lang_nr;
OSDLang = new Array ("English", "Nederlands");
langfile = new Array ("lang_eng.js", "lang_dut.js");
+var testing2;
var ShowSubDir = 1 ; // 0 = no, 1 = yes (default) // show seperate maps for subdirs in menu recordings
var showClock = 0; // 0 = no, 1 = yes
@@ -33,6 +34,7 @@ var fullupdate = 1; // If guideview is too slow, set it to 0 (for 1910/1960), fa
var ShowOsdTime = 5000; //Time to show OSD, in seconds * 1000
+var ShowSetTimer = 3000; //Time to show set timer popup, in seconds * 1000
var serverEPGdays = 3 * (60 * 60 * 24); // the higher the longer you wait while getting the epg info
@@ -208,6 +210,7 @@ var timerChan = 10;
var TimerActions;
var switchtimerID = 0;
var initialDelayID = 0;
+var CAdelayID = 0;
var ProtectID = 0;
var SleepTimer = 0;
var SleepTimerID = -1;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-22 02:47:23 +0000