diff options
| -rw-r--r-- | History | 4 | ||||
| -rw-r--r-- | channels.js | 3 | ||||
| -rw-r--r-- | index.html | 34 | ||||
| -rw-r--r-- | settings.js | 3 |
4 files changed, 34 insertions, 10 deletions
@@ -4,7 +4,7 @@ Motorola Vip : 1960, 1910, 1903, 1963. VDR 1.7.29 0.21 Language in sepate file, link your lang_XXX.js to language.js to activate it. - Updated EPG filter, (DVB-T defaults to German) + Updated EPG filter, (DVB-T defaults to German), added MTV transponder on 19E. Audio, subs etc settings are now stored on the box. So they are kept after reboot. OSD Time out can be set from settings.js Pause Live TV on Server @@ -12,7 +12,7 @@ VDR 1.7.29 Timer ADD/ Timer DEL is now possible by using SmartTVWeb (Show Timers still uses restfulapi) (No more patching of restfulapi is needed!) Instant REC now only records current program ( no EPG, no recording ) Recordsmenu shows recording date/time - + Protection uses Timeout to reprotect. 0.20 Updated EPG filter diff --git a/channels.js b/channels.js index 0d8d480..e38878e 100644 --- a/channels.js +++ b/channels.js @@ -831,8 +831,7 @@ channelsnames[610] = "VH1 (S)"; channels[610] = "S19.2E-1-1066-28656"; channelsnames[611] = "MTV Music 24 (S)"; channels[611] = "S19.2E-1-1078-28671"; -channelsnames[612] = "GUNAZ TV (S)"; -channels[612] = "S13.0E-318-13400-4763"; + channelsnames[613] = "Greatest Hits TV (S)"; channels[613] = "S28.2E-2-2311-52010"; channelsnames[614] = "Blissmas (S)"; @@ -1552,6 +1552,12 @@ function StreamInfo(si) { is.setObject("cfg.locale.ui","fra",is.STORAGE_VOLATILE); } + // MTV transponder + if(SI[0]=="S19.2E" && SI[2]=="1066") { + is.setObject("cfg.locale.ui","eng",is.STORAGE_VOLATILE); + } + + if(SI[0]=="S19.2E" && SI[2]=="1078" && SI[3]=="28679") { //Nick NL is.setObject("cfg.locale.ui","dut",is.STORAGE_VOLATILE); @@ -1982,10 +1988,14 @@ function onKeyMenu(keyCode) { if (menu == 1) { - ShowProtectedChannels = 1 - ShowProtectedChannels; - if (ShowProtectedChannels == 1 && protChn[ChanGroup] == 1) { ChanGroup = 0; currChan = defChan[ChanGroup]; play(currChan); } - isSetupMenu = 0; - mainmenu.style.opacity = 0; + ShowProtectedChannels = 1 - ShowProtectedChannels; + if (ProtectID) { clearTimeout(ProtectID); } + if (ShowProtectedChannels == 0 && ProtectTimeOut !== 0 ) { + ProtectID = setTimeout("ShowProtectedChannels = 1; if (protChn[ChanGroup] == 1) {ChanGroup = 0; currChan = defChan[ChanGroup]; play(currChan); }",ProtectTimeOut); + } + if (ShowProtectedChannels == 1 && protChn[ChanGroup] == 1) { ChanGroup = 0; currChan = defChan[ChanGroup]; play(currChan); } + isSetupMenu = 0; + mainmenu.style.opacity = 0; } break; case KEY_8: @@ -2984,9 +2994,11 @@ try { recDummy = recGUID[i].split("."); recDummy = recDummy[(recDummy.length-2)].split("-"); recChan[i] = recDummy[0] + "\uE003-\uE003" + channelsnames[(recDummy[0])]; + recProt[i] = protChn[Number(Left((recDummy[0] / 1000),1))]; } else { //Media directory recChan[i] = "Media File"; + recProt[i] = 0; // No protection for Media Files. } } @@ -3105,6 +3117,7 @@ try { xmlhttp.send(); recList[currMed] = ""; recGroup[currMed] = -1; + recProt[currMed] = 0; } catch(e) { alert("Delete Recordings problem: " + e); } @@ -3148,9 +3161,9 @@ function MakeRecList() { } else { recList[i] = "\uE003" + result + "\uE003" + recList[i]; } - x = recTitl[i][recMap]; xx = recTitl[i][recMap + 1]; + if ((recProt[i] == 1) && (ShowProtectedChannels == 1)) { recList[i] = "";} } } @@ -3178,6 +3191,9 @@ function MakeRecList2() { recList[i] = "\uE003\uE003" + result + "\uE003" + recTitl[i]; } } + + if ((recProt[i] == 1) && (ShowProtectedChannels == 1)) { recList[i] = "";} + x = recTitl[i][0]; } } @@ -3200,6 +3216,8 @@ function MakeRecList3(GroupID) { } MaxInGroup = MaxInGroup + 1; + if ((recProt[i] == 1) && (ShowProtectedChannels == 1)) { recList[i] = "";} + } else { recList[i] = "" ; } @@ -3218,7 +3236,11 @@ function AddInfo(info) { d=addzero(d); h=addzero(h); m=addzero(m); - result = "\uE003" + d + '-' + month + '-' + year + ' ' + h + ':' + m; + if ( year==1970 ) { + result = "\uE003"; + } else { + result = "\uE003" + d + '-' + month + '-' + year + ' ' + h + ':' + m; + } // } diff --git a/settings.js b/settings.js index f7e0154..d8c568f 100644 --- a/settings.js +++ b/settings.js @@ -27,6 +27,7 @@ var TimeShift = 0; // 0 = no, 1 = yes timeshift var ShowSubs = 1; // 0 = no, 1 = yes (default) var KillStream = 1; // 1 = Close stream on Standby var ShowProtectedChannels = 1; // 0 = yes show, 1 = don't show protected channels (default) +var ProtectTimeOut = 60 * (60 * 1000); //time out in minutes (0 = no timeout) var ShowSource = 1; // show source in OSD var pipPlayer = 0; // 0 = no, 1 = yes Pip var mediaRecorder = 1; // 0 = no, 1 = yes local recording. @@ -170,6 +171,7 @@ var timerChan = 10; var TimerActions = ""; var switchtimerID = 0; var initialDelayID = 0; +var ProtectID = 0; var SleepTimer = 0; var SleepTimerID = -1; @@ -217,6 +219,7 @@ var recGUID = new Array(); // GUID of recording var recChan = new Array(); // Channel ID var recDummy= new Array(); // var recGroup= new Array(); // group index +var recProt = new Array(); // protect recording based on channelgroup var subgroup= 0 ; // Used for subdirs in recording view var MaxInGroup=14; // Used for subdirs in recording view |