diff options
| -rw-r--r-- | channels.js | 2 | ||||
| -rw-r--r-- | channels1.js | 1 | ||||
| -rw-r--r-- | channels5.js | 2 | ||||
| -rw-r--r-- | channels6.js | 2 | ||||
| -rw-r--r-- | channels9.js | 1 | ||||
| -rw-r--r-- | index.html | 33 | ||||
| -rw-r--r-- | settings.js | 9 |
7 files changed, 25 insertions, 25 deletions
diff --git a/channels.js b/channels.js index 2c44514..55a488c 100644 --- a/channels.js +++ b/channels.js @@ -1262,4 +1262,4 @@ channels[969] = "S28.2E-2-2068-21200"; channelsnames[970] = "WDR Düsseldorf HD (S)"; channels[970] = "S19.2E-1-1201-28328"; - +maxChan[0] = 970; // set to max TV channel else you see 'undefined' in guide view diff --git a/channels1.js b/channels1.js index 101e68c..cfa94a9 100644 --- a/channels1.js +++ b/channels1.js @@ -401,3 +401,4 @@ channels[1952] = "S30.0W-1388-1388-3" channelsnames[1953] = "FOX Sports HD (S)" channels[1953] = "S30.0W-1388-1388-7" +maxChan[1] = 1953; // set to max HD channel else you see 'undefined' in guide view diff --git a/channels5.js b/channels5.js index 1d43d42..8ff9277 100644 --- a/channels5.js +++ b/channels5.js @@ -21,3 +21,5 @@ channels[5008] = "S19.2E-53-1097-2031-239.255.0.8:11111"; channelsnames[5009] = "NET5 (S)"; channels[5009] = "S19.2E-53-1105-4003-239.255.0.9:11111"; +maxChan[5] = 5009; // set to max multicast channel else you see 'undefined' in guide view + diff --git a/channels6.js b/channels6.js index 2f0e90c..3283cf0 100644 --- a/channels6.js +++ b/channels6.js @@ -81,4 +81,4 @@ channels[6038]="S13.0E-318-15800-16933"; channelsnames[6039] = "DARING TV (S)"; channels[6039]="S13.0E-318-15800-16931"; - +maxChan[6] = 6039; // set to max prt channel else you see 'undefined' in guide view diff --git a/channels9.js b/channels9.js index b7d3c30..5b140a7 100644 --- a/channels9.js +++ b/channels9.js @@ -130,3 +130,4 @@ channels[9065] = "S30.0W-2-15-19"; channelsnames[9066] = "Musicam 6 (S)"; channels[9066] = "S30.0W-2-15-20"; +maxChan[9] = 9066; // set to max rd channel else you see 'undefined' in guide view @@ -372,7 +372,7 @@ function onKeyDown(event) { if (currChan > (minChan[ChanGroup] + 8)) { decChan(9); } else { - currChan = maxChan[ChanGroup] - currChan; + currChan = baseChn[ChanGroup] + (maxChan[ChanGroup] - currChan); } do { @@ -405,7 +405,7 @@ function onKeyDown(event) { if (currChan < (maxChan[ChanGroup] - 9 )) { incChan(9); } else { - currChan = maxChan[ChanGroup] - currChan; + currChan = baseChn[ChanGroup] + (maxChan[ChanGroup] - currChan); } do { @@ -627,22 +627,23 @@ function onKeyDown(event) { break; case "TV": case "RADIO": - if(ChanGroup !== 9) { - //Radio - defChan[ChanGroup] = currChan; - ChanGroup = 9; - currChan = defChan[9]; - } else { - //TV - defChan[ChanGroup] = currChan; - ChanGroup = 0; - currChan = defChan[0]; + if(isFullscreen) { + if(ChanGroup !== 9) { + //Radio + defChan[ChanGroup] = currChan; + ChanGroup = 9; + currChan = defChan[9]; + } else { + //TV + defChan[ChanGroup] = currChan; + ChanGroup = 0; + currChan = defChan[0]; + } + isSetupMenu = 0; + mainmenu.style.opacity = 0; + play(channels[currChan]); } - isSetupMenu = 0; - mainmenu.style.opacity = 0; - play(channels[currChan]); break; - case KEY_0: digit = 0; Makedigit(); diff --git a/settings.js b/settings.js index bf71ba3..21d2f2e 100644 --- a/settings.js +++ b/settings.js @@ -24,6 +24,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. months = new Array('January', 'February', 'March', 'April', 'May', 'June', 'Jully', 'August', 'September', 'October', 'November', 'December'); days = new Array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'); @@ -35,10 +36,9 @@ NN[2] = "Schedule"; NN[3] = "TIMER"; NN[4] = "-----"; -var ShowProtectedChannels = 1; // Default don't show protected channels. var VolumeStep = 5; // Steps the volume buttons make -var ChanGroup = 0; // default TV group +var ChanGroup = (currChan/1000).toFixed(0); // default group var minChan = new Array(); var maxChan = new Array(); var defChan = new Array(); var baseChn = new Array(); var protChn = new Array(); var ServerAdres = new Array(); // Define settings for Channels. // Server for Recordings @@ -48,7 +48,6 @@ var MPDAddress = server_ip + ":8888"; // Radio channels.js Settings minChan[9] = 9001; -maxChan[9] = 9099; // set not too far from max rd channel to speed up zapping defChan[9] = 9051; baseChn[9] = 9000; protChn[9] = 0; @@ -56,7 +55,6 @@ ServerAdres[9] = server_ip + ":3000/"; // Protected channels.js Settings minChan[6] = 6001; -maxChan[6] = 6040; // set not too far from max prt channel to speed up zapping defChan[6] = 6001; baseChn[6] = 6000; protChn[6] = 1; @@ -64,7 +62,6 @@ ServerAdres[6] = server_ip + ":3000/"; // TV channels.js Settings minChan[0] = 1; -maxChan[0] = 999; // set not too far from max TV channel to speed up zapping defChan[0] = currChan; baseChn[0] = 0; protChn[0] = 0; @@ -72,7 +69,6 @@ ServerAdres[0] = server_ip + ":3000/"; //HD list minChan[1] = 1001; -maxChan[1] = 1999; // set not too far from max HD channel to speed up zapping defChan[1] = 1001; baseChn[1] = 1000; protChn[1] = 0; @@ -80,7 +76,6 @@ ServerAdres[1] = server_ip + ":3000/"; // MultiCast minChan[5] = 5001; -maxChan[5] = 5010; // set not too far from max multicast channel to speed up zapping defChan[5] = 5001; baseChn[5] = 5000; protChn[5] = 0; |