diff options
author | M. Voerman <rekordc@gmail.com> | 2014-08-08 22:13:39 +0200 |
---|---|---|
committer | M. Voerman <rekordc@gmail.com> | 2014-08-08 22:13:39 +0200 |
commit | 9bfe33fff538a3c0b36d1c35afee39287d7e34d0 (patch) | |
tree | bd7254637b951b84f5d0b23d56c0d60541dc7fa7 | |
parent | 6c061fb5ded6e8308b4da148bd42fab4471a2e4a (diff) | |
download | vdr-vipclient-9bfe33fff538a3c0b36d1c35afee39287d7e34d0.tar.gz vdr-vipclient-9bfe33fff538a3c0b36d1c35afee39287d7e34d0.tar.bz2 |
Release .25
-rw-r--r-- | index.html | 6 | ||||
-rw-r--r-- | settings.js | 2 |
2 files changed, 5 insertions, 3 deletions
@@ -1497,7 +1497,7 @@ if (!BackGroundColor) { BackGroundColor = DefaultBGColor;} } } else if(SwitchTimer == 3) { ProgTime -= preRecTime; - ProgDura += (afterRecTime + preRecTime); + ProgDura = Number(ProgDura) + (afterRecTime + preRecTime); var y = (new Date().getTime()/1000).toFixed(0); if(ProgTime < y) { ProgDura = ProgDura - (y - ProgTime); @@ -2566,6 +2566,8 @@ function onKeyMenu(keyCode) { var y = Number((new Date().getTime()/1000).toFixed(0)) + 2; //stop current recording after 2 sec. ss.reschedule(x[timerID-1],"RecLocal","record_hd_from_ip", y , 0) + ss.setParameter(x[timerID-1], "Type", "\uE01C"); + LoadTimers(); } InitMenu(menu); break; @@ -2916,7 +2918,7 @@ if(menu == 2) { // Timers menu } } if (mediaRecorder) { var x = NN[3]; } else { var x = Lang[19]; } - mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[7] + "</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'>\n 0 -" + Lang[9] + "\n" + booking + " <font style='color:red;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[48] + "<font style='color:green;'>\u25CF<font style='" + color_main_font + ";'> -" + x + "<font style='color:yellow;'>\u25CF<font style='" + color_main_font + ";'> - " + Lang[19] + " <font style='color:blue;'>\u25CF<font style='" + color_main_font + ";'> - " + NN[5] + "</pre>"; + mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[7] + "</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'>\n 0 -" + Lang[9] + "\n" + booking + " <font style='color:red;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[48] + "<font style='color:green;'>\u25CF<font style='" + color_main_font + ";'> - " + x + " <font style='color:yellow;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + "<font style='color:blue;'>\u25CF<font style='" + color_main_font + ";'> - " + NN[5] + "</pre>"; } if(menu == 3) { // MPD Menu diff --git a/settings.js b/settings.js index b20bc3e..7a5b454 100644 --- a/settings.js +++ b/settings.js @@ -2,7 +2,7 @@ // Default settings // -var Version = "0.25.14"; +var Version = "0.25"; server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://easyvdr","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"); |