diff options
| author | M. Voerman <rekordc@gmail.com> | 2014-12-24 23:08:43 +0100 |
|---|---|---|
| committer | M. Voerman <rekordc@gmail.com> | 2014-12-24 23:08:43 +0100 |
| commit | 3040a113af07ab17c044c84babcd19c9a46adef2 (patch) | |
| tree | 1eb9184edb612cd215a8ded0b7cf582b6d80cb57 /javascript/main.js | |
| parent | 18c07b01d3008025006b72c0a6128e467d5cc2b3 (diff) | |
| download | vdr-vipclient-3040a113af07ab17c044c84babcd19c9a46adef2.tar.gz vdr-vipclient-3040a113af07ab17c044c84babcd19c9a46adef2.tar.bz2 | |
Added global multicast setting
Added config/custom.js, override global settings, define local settings (setting file isn't included in the download/distro)
Added config/<macaddress>.js settings for a single box, read after all other settings.
Diffstat (limited to 'javascript/main.js')
| -rw-r--r-- | javascript/main.js | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/javascript/main.js b/javascript/main.js index 381f424..030fa19 100644 --- a/javascript/main.js +++ b/javascript/main.js @@ -457,6 +457,13 @@ function play(uri) { initialDelayPlay = 0; } + if (Global_Multicast) { + var x = Math.floor(currChan / 256); + uri = "239.255." + x.toString() + "." + (currChan - ( x * 256)).toString() + ":11111"; + initialDelayPlay = 0; + } + + URL = uri; initialDelayPlayID = setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",initialDelayPlay); initialDelayPlay = 500; // wait 500 ms before zap to next channel @@ -1405,7 +1412,7 @@ function OSDhtml(){ if (ShowSource == 1) { osdname.innerHTML = "<span class=osdname" + cssres[css_nr][Set_Res] + ">" + channels[currChan].split("-")[0] + "\uE003" + channelsnames[currChan] + "</span>"; } else { - osdname.innerHTML = "<span class=osdname" + cssres[css_nr][Set_Res] + ">" + channelsnames[currChan] + "</span>"; + osdname.innerHTML = "<span class=osdname" + cssres[css_nr][Set_Res] + "> \uE003 " + channelsnames[currChan] + "</span>"; } osdepg.innerHTML = "<pre class=osdepg" + cssres[css_nr][Set_Res] + ">" + EPG[0][7][currChan] + "</pre>\n<pre class=osdepg" + cssres[css_nr][Set_Res] + ">" + EPG[1][7][currChan] + "</pre>"; osdepginfo.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">" + "<p class=epg_head>" + currChan + "\uE003" + channelsnames[currChan] + "</p><p class=epg_avinfo>" + AvInfo[currChan] + "</p><p class=epg_title>" + EPG[0][7][currChan] + EPG[0][9][currChan] + EPG[0][8][currChan] + "</p>\n<p class=epg_info>" + EPG[0][4][currChan] + "</p>\n<p class=epg_info_long>" + Left(EPG[0][5][currChan],750) + "</p></span>"; @@ -2253,7 +2260,7 @@ function onKeyMenu(keyCode) { break; case "Red": - if (menu == 0) { + if (menu == 0 && PowerDownServer) { ServerPowerDown(); isSetupMenu = 0; mainmenu.style.opacity = 0; @@ -4827,7 +4834,7 @@ function ServerPause() { function ServerPowerDown() { //Power Down Server - if (smartTVplugin && PowerDownServer) { + if (smartTVplugin) { try { xmlhttp=new XMLHttpRequest(); xmlhttp.open('GET',(server_ip + recServ + '/execcmd?cmd=' + PowerDown)); |