diff options
| author | M. Voerman <rekordc@gmail.com> | 2013-04-04 12:31:21 +0200 |
|---|---|---|
| committer | M. Voerman <rekordc@gmail.com> | 2013-04-04 12:31:21 +0200 |
| commit | 70a5ba14db51f843712828f661cc521f204352c3 (patch) | |
| tree | 981a8e7151be653f665fbb49a80a4a5ded0834ce | |
| parent | 1e765cd5dd76337d52fc0a6312f93609d762d841 (diff) | |
| download | vdr-vipclient-70a5ba14db51f843712828f661cc521f204352c3.tar.gz vdr-vipclient-70a5ba14db51f843712828f661cc521f204352c3.tar.bz2 | |
Switch timer update
| -rw-r--r-- | History | 1 | ||||
| -rw-r--r-- | index.html | 16 | ||||
| -rw-r--r-- | settings.js | 6 |
3 files changed, 16 insertions, 7 deletions
@@ -12,6 +12,7 @@ VDR 1.7.29 Fixed Menu 'Server : Media Directory' Fixed EPG & Server EPG info menu no more 'Undefined' but channelname/ number When playing recordings you can switch subs on/off with 'yellow' + Switch Timer for protected channels only switch when protection is off 0.17 Show EPG from Server limited to X days ( 3 = default, set in settings.js) @@ -2925,12 +2925,20 @@ function onScheduledStart(event) { setOSDtimer(); if (isMediaMenu) { UnloadMediaSettings(); } - // switch only if not already on that channel. - if (currChan !== Number(toi.schedulerService.getParameter(event.booking.id, "Channel"))) { - currChan = Number(toi.schedulerService.getParameter(event.booking.id, "Channel")); + prevChan = currChan; + currChan = Number(toi.schedulerService.getParameter(event.booking.id, "Channel")); + ChanGroup = Number(Left((currChan / 1000),1)); + + // check if Group isn't protected + if ((protChn[ChanGroup] == 1) && (ShowProtectedChannels == 1)) { + currChan = prevChan; ChanGroup = Number(Left((currChan / 1000),1)); - play(channels[currChan]); } + + // switch only if not already on that channel. + if (currChan !== prevChan) { + play(channels[currChan]); + } } else { try { createNewAsset() diff --git a/settings.js b/settings.js index d9bbcf9..898d90b 100644 --- a/settings.js +++ b/settings.js @@ -5,9 +5,9 @@ // 720x576 // var Xfactor = 720 / 720; var Yfactor = 576 / 576; // 1280x720 -var Xfactor = 1280 / 720; var Yfactor = 720 / 576; +// var Xfactor = 1280 / 720; var Yfactor = 720 / 576; // 1920x1080 -// var Xfactor = 1920 / 720; var Yfactor = 1080 / 576; +var Xfactor = 1920 / 720; var Yfactor = 1080 / 576; var server_ip = "http://192.168.3.15"; @@ -25,7 +25,7 @@ var SwitchGuide = 0; // 0 = no, 1 = yes 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; // Default don't show protected channels. +var ShowProtectedChannels = 1; // 0 = yes show, 1 = don't show protected channels (default) var ShowSource = 1; // show source in OSD var serverEPGdays = 3 * (60 * 60 * 24); // the higher the longer you wait while getting the epg info |