diff options
| -rw-r--r-- | channels.js | 7 | ||||
| -rw-r--r-- | channels1.js | 5 | ||||
| -rw-r--r-- | channels5.js | 9 | ||||
| -rw-r--r-- | channels6.js | 7 | ||||
| -rw-r--r-- | channels9.js | 7 | ||||
| -rw-r--r-- | index.html | 36 | ||||
| -rw-r--r-- | settings.js | 36 |
7 files changed, 57 insertions, 50 deletions
diff --git a/channels.js b/channels.js index 55a488c..fd76633 100644 --- a/channels.js +++ b/channels.js @@ -29,7 +29,12 @@ // 960 - HD channels dvb-s // // - +// TV channels.js Settings +minChan[0] = 1; +defChan[0] = 10; +baseChn[0] = 0; +protChn[0] = 0; +ServerAdres[0] = server_ip + ":3000/"; channelsnames[1] = "NED1 (S)"; channels[1] = "S19.2E-53-1105-4011"; diff --git a/channels1.js b/channels1.js index cfa94a9..70446c6 100644 --- a/channels1.js +++ b/channels1.js @@ -1,6 +1,11 @@ // // HD channels // +minChan[1] = 1001; +defChan[1] = 1001; +baseChn[1] = 1000; +protChn[1] = 0; +ServerAdres[1] = server_ip + ":3000/"; channelsnames[1001] = "NED1 HD (S)" channels[1001] = "S23.5E-3-3208-7035" diff --git a/channels5.js b/channels5.js index 8ff9277..9aa4dca 100644 --- a/channels5.js +++ b/channels5.js @@ -2,6 +2,15 @@ // MultiCast Channels. // +// MultiCast +minChan[5] = 5001; +defChan[5] = 5001; +baseChn[5] = 5000; +protChn[5] = 0; +ServerAdres[5] = "MultiCast"; +// MultiCast, channels[x] layout DVB(Satposition, C or T)-NID-TID-SID-multicast address + + channelsnames[5001] = "NED1 (S)"; channels[5001] = "S19.2E-53-1105-4011-239.255.0.1:11111"; channelsnames[5002] = "NED2 (S)"; diff --git a/channels6.js b/channels6.js index 3283cf0..b9a6618 100644 --- a/channels6.js +++ b/channels6.js @@ -2,6 +2,13 @@ // Some protected channels // // +// Protected channels.js Settings +minChan[6] = 6001; +defChan[6] = 6001; +baseChn[6] = 6000; +protChn[6] = 1; +ServerAdres[6] = server_ip + ":3000/"; + channelsnames[6001] = "Meiden van Holland Hard (T)"; channels[6001]="T-8720-2213-38"; channelsnames[6002] = "XXL (S)"; diff --git a/channels9.js b/channels9.js index 5b140a7..765a867 100644 --- a/channels9.js +++ b/channels9.js @@ -3,6 +3,13 @@ // and some rock channels // // +// Radio channels.js Settings +minChan[9] = 9001; +defChan[9] = 9051; +baseChn[9] = 9000; +protChn[9] = 0; +ServerAdres[9] = server_ip + ":3000/"; + channelsnames[9001] = "NL-Radio 1 (S)"; channels[9001] = "S19.2E-53-1097-2055"; channelsnames[9002] = "NL-Radio 2 (S)"; @@ -24,13 +24,15 @@ // // -var Version = "0.14 2013/01/27" +var Version = "0.15" -for (var i = minChan[0]; i < (maxChan[0]+1); i++) { EPG[0][4][i] = "";EPG[1][4][i] = "";EPG[0][5][i] = "";EPG[1][5][i] = "";EPG[0][7][i] = "";EPG[1][7][i] = ""; } -for (var i = minChan[1]; i < (maxChan[1]+1); i++) { EPG[0][4][i] = "";EPG[1][4][i] = "";EPG[0][5][i] = "";EPG[1][5][i] = "";EPG[0][7][i] = "";EPG[1][7][i] = ""; } -for (var i = minChan[5]; i < (maxChan[5]+1); i++) { EPG[0][4][i] = "";EPG[1][4][i] = "";EPG[0][5][i] = "";EPG[1][5][i] = "";EPG[0][7][i] = "";EPG[1][7][i] = ""; } -for (var i = minChan[6]; i < (maxChan[6]+1); i++) { EPG[0][4][i] = "";EPG[1][4][i] = "";EPG[0][5][i] = "";EPG[1][5][i] = "";EPG[0][7][i] = "";EPG[1][7][i] = ""; } -for (var i = minChan[9]; i < (maxChan[9]+1); i++) { EPG[0][4][i] = "";EPG[1][4][i] = "";EPG[0][5][i] = "";EPG[1][5][i] = "";EPG[0][7][i] = "";EPG[1][7][i] = ""; } +for (var x = 0; x < 10; x++) { + if (minChan[x]) { + for (var i = minChan[x]; i < (maxChan[x]+1); i++) { + EPG[0][4][i] = "";EPG[1][4][i] = "";EPG[0][5][i] = "";EPG[1][5][i] = "";EPG[0][7][i] = "";EPG[1][7][i] = ""; + } + } +} window.onkeydown = onKeyDown; @@ -498,13 +500,21 @@ function onKeyDown(event) { } break; case "Blue": - if(isFullscreen) { - RestartPortal(); - } else if(isSchedule ==0) { - SetOsdInfo(); - osdepginfo.style.opacity = 1 - NowNext; - osdepginfonext.style.opacity = NowNext; - setTimeout("epgactive = 0; osdepginfo.style.opacity = 0; osdepginfonext.style.opacity = 0;", 5000); +// if(isFullscreen) { +// RestartPortal(); +// } else + if(isSchedule == 0) { + if(!epgactive) { + SetOsdInfo(); + osdepginfo.style.opacity = 1; + osdepginfonext.style.opacity = 0; + epgactive = 1; + } else { + osdepginfo.style.opacity = 0; + osdepginfonext.style.opacity = 0; + epgactive = 0; + } +// setTimeout("epgactive = 0; osdepginfo.style.opacity = 0; osdepginfonext.style.opacity = 0;", 5000); } break; case "BrowserBack": diff --git a/settings.js b/settings.js index 4cd566c..35e7d61 100644 --- a/settings.js +++ b/settings.js @@ -47,42 +47,6 @@ var recServ = server_ip + ":8000"; var RestFulAPI = server_ip + ":8002"; var MPDAddress = server_ip + ":8888"; -// Radio channels.js Settings -minChan[9] = 9001; -defChan[9] = 9051; -baseChn[9] = 9000; -protChn[9] = 0; -ServerAdres[9] = server_ip + ":3000/"; - -// Protected channels.js Settings -minChan[6] = 6001; -defChan[6] = 6001; -baseChn[6] = 6000; -protChn[6] = 1; -ServerAdres[6] = server_ip + ":3000/"; - -// TV channels.js Settings -minChan[0] = 1; -defChan[0] = 10; -baseChn[0] = 0; -protChn[0] = 0; -ServerAdres[0] = server_ip + ":3000/"; - -//HD list -minChan[1] = 1001; -defChan[1] = 1001; -baseChn[1] = 1000; -protChn[1] = 0; -ServerAdres[1] = server_ip + ":3000/"; - -// MultiCast -minChan[5] = 5001; -defChan[5] = 5001; -baseChn[5] = 5000; -protChn[5] = 0; -ServerAdres[5] = "MultiCast"; -// MultiCast, channels[x] layout DVB(Satposition, C or T)-NID-TID-SID-multicast address - var channeldigits = 2; // 0 - Max 9, 1 max 99, 2 max 999 or 3 max 9999 channels directly selectable by numbers (Don't set it to > 2 it crashes the player) // |