summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--History1
-rw-r--r--index.html36
-rw-r--r--settings.js2
3 files changed, 31 insertions, 8 deletions
diff --git a/History b/History
index 5169afc..89bcacb 100644
--- a/History
+++ b/History
@@ -4,6 +4,7 @@ Motorola Vip : 1960, 1910, 1903, 1963.
VDR 1.7.29+
0.25 Get recordings from Streamdev, Restfapi or SmartTVweb but still only play works with SmartTVweb plugin
+ Check if SmartTVweb is on the server if not turn SmartTVweb options off
0.24 vip.getmarks used for selecting getmarks 0 = restfulapi, 1 = SmartTVWeb (not all users have the newest SmartTVWeb)
diff --git a/index.html b/index.html
index 89e5e82..ebd4c78 100644
--- a/index.html
+++ b/index.html
@@ -2716,11 +2716,29 @@ osdepginfo.style.opacity = 0;
if(menu == 0) { // Main Menu
MainMenu = 0;
var htmltext = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[9] + "\n ( " + Version + " )</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'> 1 -" + Lang[10] + "\n 2 -" + Lang[7] + "\n 3 -" + Lang[11];
- if (smartTVplugin) { htmltext += "\n 4 -" + Lang[12]; } else { htmltext += "\n 4 -" + Lang[19]; }
- htmltext += "\n 5 -" + Lang[13] + "\n 6 -" + Lang[14];
- if (smartTVplugin) { htmltext += "\n 7 -" + Lang[15]; } else { htmltext += "\n 7 -" + Lang[19]; }
+ if (smartTVplugin) {
+ htmltext += "\n 4 -" + Lang[12];
+ } else {
+ htmltext += "<font style='" + color_notset +";'>" + "\n 4 -" + Lang[12] + "<font style='" + color_main_font +";'>" ;
+ }
+// if (smartTVplugin) {
+ htmltext += "\n 5 -" + Lang[13];
+// } else {
+// htmltext += "<font style='" + color_notset +";'>" + "\n 5 -" + Lang[13] + "<font style='" + color_main_font +";'>" ;
+// }
+ htmltext += "\n 6 -" + Lang[14];
+ if (smartTVplugin) {
+ htmltext += "\n 7 -" + Lang[15];
+ } else {
+ htmltext += "<font style='" + color_notset +";'>" + "\n 7 -" + Lang[15] + "<font style='" + color_main_font +";'>" ;
+ }
htmltext += "\n 8 -" + Lang[16];
- if (ShowMPD) { htmltext += "\n 9 -" + Lang[17]; } else { htmltext += "\n 9 -" + Lang[19]; }
+ if (ShowMPD) {
+ htmltext += "\n 9 -" + Lang[17];
+ } else {
+ htmltext += "<font style='" + color_notset +";'>" + "\n 9 -" + Lang[17] + "<font style='" + color_main_font +";'>" ;
+ }
+
htmltext += "\n 0 - " + Lang[83] + "\n\n <font style='color:red;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + "<font style='color:green;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + "<font style='color:yellow;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[35] + " <font style='color:blue;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[18] + "</pre>";
mainmenu.innerHTML = htmltext;
}
@@ -2992,9 +3010,9 @@ try {
timers[i] += timersDays[i] + "\uE003" + timersStrt[i] + "\uE003" + timersStop[i] + "\uE003" + Left(timersName[i],8) + "\uE003" + Left(timersFile[i],15) + "\n" ;
timerOK = 1;
}
- } else {
+ } else if (get_timer == 0) {
xmlhttp=new XMLHttpRequest();
- xmlhttp.open("GET",(RestFulAPI + "/timers.xml"),false); // ?" + new Date().getTime()),false);
+ xmlhttp.open("GET",(server_ip + RestFulAPI + "/timers.xml"),false); // ?" + new Date().getTime()),false);
xmlhttp.send();
xmlDoc=xmlhttp.responseXML;
var x=xmlDoc.getElementsByTagName("timer");
@@ -3023,13 +3041,14 @@ try {
timersFile[i] = x[i].getElementsByTagName("param")[14].childNodes[0].nodeValue + fill + fill;
timer[i] += timersDays[i] + "\uE003" + timersStrt[i] + "\uE003" + timersStop[i] + "\uE003" + Left(timersName[i],8) + "\uE003" + Left(timersFile[i],15) + "\n" ;
timerOK = 1;
+ alert (timer[i]);
}
}
} catch(e) {
timerOK = 0;
alert("Get Timers problem: " + e);
- mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[7] + "</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'><center>\n " + Lang[36] + ": \n " + server_ip + recServ + "</center></pre>";
+ mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[7] + "</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'><center>\n " + Lang[36] + ": \n " + server_ip + "</center></pre>";
}
}
@@ -4079,6 +4098,9 @@ try {
free_space = x[0].getElementsByTagName("free")[0].childNodes[0].nodeValue;
used_space = x[0].getElementsByTagName("used")[0].childNodes[0].nodeValue;
perc_space = x[0].getElementsByTagName("percent")[0].childNodes[0].nodeValue;
+ if (CheckStatus) {
+ smartTVplugin = 1;
+ }
} catch(e) {
alert("Get VDR Status problem: " + e);
if (CheckStatus) {
diff --git a/settings.js b/settings.js
index 9230b01..6954f9b 100644
--- a/settings.js
+++ b/settings.js
@@ -18,7 +18,6 @@ var subs_prio = "dut,eng"; //Subtitle prio
var get_timer = 1; // gettimersserver 1 = smarttvweb, 0 = restfulapi
var get_recordings = 1; // getrecordings 0 = restfulapi(only showing no play), 1 = smarttvweb, 2 = streamdev (not working yet)
-var smartTVplugin = 0; // Turn on or off the use of smartTVplugin
var UseNewReclist = 1 ; //use new recordingslist function
@@ -353,3 +352,4 @@ var initialDelayPlay = 0;
var PlayDelayID;
var PIPDelayID;
var ErrorAgain = 0;
+var smartTVplugin; // Turn on or off the use of smartTVplugin