diff options
| -rw-r--r-- | History | 1 | ||||
| -rw-r--r-- | javascript/main.js | 9 | ||||
| -rw-r--r-- | javascript/settings.js | 5 |
3 files changed, 8 insertions, 7 deletions
@@ -25,6 +25,7 @@ VDR 1.7.29+ Added config/<macaddress>.js settings for a single box, read after all other settings. Bash Script update, default channel of a group is now the first channel (override this in config\custom.js) 'timed' 0 to swap previous <> current channel, first channel of a group can't be 0 (1000,2000 etc) anymore + Added global server setting (default = 1, act as before. 0 = set for every channel server address) diff --git a/javascript/main.js b/javascript/main.js index 9b3c405..484f493 100644 --- a/javascript/main.js +++ b/javascript/main.js @@ -456,8 +456,10 @@ function play(uri) { var x = Math.floor(currChan / 256); uri = "239.255." + x.toString() + "." + (currChan - ( x * 256)).toString() + ":11111"; initialDelayPlay = 0; - } else { + } else if (Global_Server) { uri = ServerAdres[ChanGroup] + uri; + } else { + uri = Server_Address[currChan] + StreamPort + uri; } @@ -1449,17 +1451,14 @@ function updateOSDtime(timchan) { tm=addzero(tm); EPG[0][7][timchan] = th + ":" + tm + " ("; - - alert (Number(EPGminutes)); - if (Number(EPGminutes) > 1440 || Number(EPGminutes) < -1440 ) { // Duration is >24h, maybe current time isn't right. EPG[0][7][timchan] += EPG[0][3][timchan]; } else { EPG[0][7][timchan] += EPGminutes + " / " + ((EPG[0][3][timchan])-EPGminutes).toFixed(0); } - EPG[0][7][timchan] += ")" + " " + EPG[0][1][timchan] + " "; + if (!EPG[0][2][timchan] || ((EPG[0][3][timchan]-EPGminutes) < 0)) { EPG[0][7][timchan] = " "; diff --git a/javascript/settings.js b/javascript/settings.js index 7516325..6d7d6d9 100644 --- a/javascript/settings.js +++ b/javascript/settings.js @@ -2,7 +2,7 @@ // Default settings // -var Version = "0.26.11"; +var Version = "0.26.12"; server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://192.168.178.56","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21","http://192.168.2.100","http://192.168.178.52"); @@ -11,6 +11,8 @@ var PowerDownServer = 0; // Power Down server from menu by sending cmds. (0 = no var PowerDown = 9; //With Easyvdr 0.806 it is cmds 9. var StartVolume = 15; // Volume on (re)start of the portal. var currChan = 10; // default channel +var Global_Server = 1;// 1 = old style. 0 = every channel needs server_address[channel_number] +var Server_Address = new Array(); var Global_Multicast = 0;// 1 = use only MultiCast OSDLang = new Array ("English", "Nederlands", "Deutsch"); @@ -137,7 +139,6 @@ var isFullscreen = 1; var Volume = StartVolume; var AudioOut = 3; // AUDIO_CONNECTION_TYPE_ANALOG = 0; AUDIO_CONNECTION_TYPE_SPDIF = 1; AUDIO_CONNECTION_TYPE_HDMI = 2;AUDIO_CONNECTION_TYPE_DECODER = 3;AUDIO_CONNECTION_TYPE_BUFFER = 4;AUDIO_CONNECTION_TYPE_I2S = 5; -//var epgchan = currChan; var prevChan = currChan; var oldChan; |