client for MPD switched off by default

3 files changed, 19 insertions, 6 deletions

diff --git a/History b/History
index 20ae1a2..7abbaa8 100644
--- a/History
+++ b/History
@@ -21,6 +21,7 @@ VDR 1.7.29+
 	split the info menu into box info (menu yellow) & info about settings (menu 1 - yellow)
 	Updated channels script, now adds timestamp to list which is shown in info menu.
 	EPG Mode can be set (Now/Next only or Full EPG from stream)
+	Client for MPD (http://www.musicpd.org/) turned off by default (settings.js) 
 
 
 0.23	Infobox for connection Error, not only ERRR on display but also the Infobox
diff --git a/index.html b/index.html
index 552cc75..3a69ce9 100644
--- a/index.html
+++ b/index.html
@@ -190,6 +190,12 @@ function GetSettings() {
 		is.setObject("vip.fav_max_channel","0",is.STORAGE_PERMANENT)
 	}
 
+	try {
+		if (!is.getObject("vip.showsubs")) {} 
+	} catch(e) {
+		is.setObject("vip.showsubs","1",is.STORAGE_PERMANENT)
+	}
+
 
 	var sel_group;
 	for (var i=0;i<10;i++) {
@@ -221,7 +227,8 @@ function GetSettings() {
 
 	experimental = Number(is.getObject("vip.testing"));// Use some experimental code
 	testing2 = Number(is.getObject("vip.testing2"));// Use some experimental code
-	get_marks = Number(is.getObject("vip.getmarks"));// Use some experimental code
+	get_marks = Number(is.getObject("vip.getmarks"));
+	ShowSubs = Number(is.getObject("vip.showsubs"));
 
 	Set_Res = Number(is.getObject("vip.resolution"));
 	VideoOutput();
@@ -2464,6 +2471,7 @@ function onKeyMenu(keyCode) {
 		} else if (menu == 1) {
 		 ShowSubs = 1 - ShowSubs;
 		 videoplane.subtitles = Boolean(ShowSubs); // Enable subtitles or Disable subtitles
+		 is.setObject("vip.showsubs",ShowSubs.toString(),is.STORAGE_PERMANENT);
 		} else	if (menu == 8) {
 			SetGroup(1);
 		}
@@ -2625,7 +2633,7 @@ function onKeyMenu(keyCode) {
 
 	break;
 	case KEY_9:
-		if (menu == 0 || menu == 3) {
+		if ((menu == 0 || menu == 3) && ShowMPD) {
 			menu = 3;
 			playMPD(server_ip + MPDAddress);
 		} else if (menu == 1) {
@@ -2701,7 +2709,10 @@ osdepginfo.style.opacity = 0;
 
 if(menu == 0) { // Main Menu
 	MainMenu = 0;
-	mainmenu.innerHTML = "<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] + "\n   4 -" + Lang[12] + "\n   5 -" + Lang[13] + "\n   6 -" + Lang[14] + "\n   7 -" + Lang[15] + "\n   8 -" + Lang[16] + "\n   9 -" + Lang[17] + "\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>";
+	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] + "\n   4 -" + Lang[12] + "\n   5 -" + Lang[13] + "\n   6 -" + Lang[14] + "\n   7 -" + Lang[15] + "\n   8 -" + Lang[16];
+	if (ShowMPD) { htmltext += "\n   9 -" + Lang[17]; } else { htmltext += "\n   9 -" + Lang[19]; }
+	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;
 }
 
 if(menu == 6) { // Main Menu when watching recording
diff --git a/settings.js b/settings.js
index 9a12f6a..2204e3b 100644
--- a/settings.js
+++ b/settings.js
@@ -2,7 +2,7 @@
 // Default settings
 // 
 
-var Version = "0.24.16";
+var Version = "0.24.17";
 
 server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21");
 
@@ -24,9 +24,8 @@ var UseNewReclist = 1 ; //use new recordingslist function
 var ShowSubDir = 1 ; // 0 = no, 1 = yes (default) // show seperate maps for subdirs in menu recordings
 var showClock = 0;   // 0 = no, 1 = yes
 var SwitchGuide = 0; // 0 = no, 1 = yes
-var PipSwitchGuide = 1; // 0 = no, 1 = yes // use second/pip player for getting epg update in guide view
+var PipSwitchGuide = 1; // 0 = no, 1 = yes // use second/pip player for getting epg update in guide view // !!Unstable!! box might restart
 var TimeShift = 0;   // 0 = no, 1 = yes timeshift
-var ShowSubs = 1;    // 0 = no, 1 = yes (default)
 var KillStream = 1;  // 1 = Close stream on Standby
 var ShowProtectedChannels = 1; // 0 = yes show, 1 = don't show protected channels (default)
 var ProtectTimeOut = 60 * (60 * 1000); //time out in minutes (0 = no timeout)
@@ -34,6 +33,7 @@ var ShowSource = 1; // show source in OSD
 var pipPlayer = 0; // 0 = no, 1 = yes Pip
 var mediaRecorder = 1; // 0 = no, 1 = yes local recording.
 var PauseOnServer = 0; // 0 = no pause on server, 1 = pause live TV on server
+var ShowMPD = 0; // 0 = don't use MPD, 1 = make use of MPD (http://www.musicpd.org/)
 
 var fullupdate = 1; // If guideview is too slow, set it to 0 (for 1910/1960), faster boxes can use 1
 // to force the use on boxes other then 19x3 use 2!!
@@ -69,6 +69,7 @@ var experimental;// Use some experimental code
 var lang_nr;
 var testing2;
 var get_marks; // getmarks 1 = smarttvweb, 0 = restfulapi
+var ShowSubs; //Flash stored
 
 VideoOutputModes = new Array(4,5,7); // Modes for the portal.
 VideoOutputModes_txt = new Array("NO_VIDEO_MODE","480I60","576I50","480P60","576P50","720P50","720P60","1080I50","1080I60","1080P23976","1080P24",