From f94a8c6bf019aa770fa342319794c98735d0eecf Mon Sep 17 00:00:00 2001
From: "M. Voerman" <rekordc@gmail.com>
Date: Mon, 12 May 2014 12:36:58 +0200
Subject: In settings menu you can dynamic chose the subtitle language, if the
 channel provide more subtitles. (eg TV5 europe from france)

---
 History     |  1 +
 index.html  | 23 ++++++++++++++++++-----
 settings.js |  4 +++-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/History b/History
index cba378d..b923df5 100644
--- a/History
+++ b/History
@@ -11,6 +11,7 @@ VDR 1.7.29 / 2.1.1
 	Add script to generate channels.js (svdrpsend.pl needed)
 	Erased channelsX.js
 	Subs prio can be set eq TV5 sends multiple subs. default "DUT, ENG"
+	Subtitle language can dynamic be chosen from settings menu (<menu> <1> <red>) if there is no subtitle present it resets to default.
 
 
 
diff --git a/index.html b/index.html
index fa4d7d5..80625a4 100644
--- a/index.html
+++ b/index.html
@@ -209,7 +209,7 @@ function GetSettings() {
 
 
 	is = toi.informationService;
-	is.setObject("cfg.media.subtitling.languagepriority",subs_prio,is.STORAGE_VOLATILE);
+	is.setObject("cfg.media.subtitling.languagepriority",subs_prio,is.STORAGE_PERMANENT);
 	// set default subtitle language to 
 
 
@@ -555,6 +555,7 @@ for(x=0; x<cList.length;x++) {
 	//This is an ARIB specific type of subtitles and used mainly for displaying alert messages on screen.
 	}
 	if(cList[x].type == 5) {
+		alert("TeletextStreamInfo : " + mediaPlayer.getTeletextStreamInfo(cList[x]).language)
 		AvInfo[currStream] = AvInfo[currStream] + " TXT";
 	}
 
@@ -2204,8 +2205,15 @@ function onKeyMenu(keyCode) {
 
     break;
     case "Red":
-    	if (menu == 0) {
- 		window.open("http://www.google.com");
+    	if (menu == 1) {
+		if (subs_dyn < (subs_prio_dyn.length -1)) { subs_dyn = subs_dyn + 1} else { subs_dyn = 0 }
+		is = toi.informationService;
+		if (subs_prio_dyn.length > 0) {
+			is.setObject("cfg.media.subtitling.languagepriority",subs_prio_dyn[subs_dyn],is.STORAGE_PERMANENT);
+		} else {
+			is.setObject("cfg.media.subtitling.languagepriority",subs_prio,is.STORAGE_PERMANENT);
+		}
+		InitMenu(menu);
 		break;
 	}
 
@@ -2534,7 +2542,12 @@ if(menu == 6) { // Main Menu when watching recording
 if(menu == 1) { // settings menu
 	var htmltext = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[10] + "</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'>   1 - ";
 	if (ShowSubs) { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
-	htmltext += Lang[20] + "\n   2 - \uE003" + Lang[22] + (toi.informationService.getObject("cfg.media.subtitling.modepriority")) + "\n   3 - \uE003" + Lang[24] + (toi.informationService.getObject("cfg.media.audio.languagepriority")) + "\n   4 - " + Lang[82] + "\n   5 - VDR : " + server_ip + "\n   6 - ";
+	htmltext += Lang[20] + " <font style='color:red;'>\u25CF<font style='" + color_main_font + ";'> ";
+	if (subs_prio_dyn.length > 0) { htmltext += "(" + (subs_dyn + 1 ) + "/" + subs_prio_dyn.length + ") "; }
+	htmltext += (toi.informationService.getObject("cfg.media.subtitling.languagepriority"));
+	htmltext += "\n   2 - \uE003" + Lang[22] + (toi.informationService.getObject("cfg.media.subtitling.modepriority"));
+	htmltext += "\n   3 - \uE003" + Lang[24] + (toi.informationService.getObject("cfg.media.audio.languagepriority")); 
+	htmltext += "\n   4 - " + Lang[82] + "\n   5 - VDR : " + server_ip + "\n   6 - ";
 	if (showClock) { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
 	htmltext += Lang[25] + "\n   7 - ";
 	if (ShowProtectedChannels) { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
@@ -3011,7 +3024,7 @@ function MPD(ev) {
 if (MPDListener == 0) {
 	if (ev.state == 6 ) { 
 		showDisplay("ERRR", false, 100, 0 ); 
-		    settimer(0,Lang[67],0,2);
+		settimer(0,Lang[67],0,2);
 		}
 	
 } else {
diff --git a/settings.js b/settings.js
index 7372dd8..5301122 100644
--- a/settings.js
+++ b/settings.js
@@ -101,11 +101,13 @@ Xfactor[2] = 1920 / 720; Yfactor[2] = 1080 / 576;
 
 var audio = 0;
 var audio_dyn = 0;
+var subs_dyn = 0;
 
 lang_prio = new Array("dut,eng,und","ger,deu,eng","eng,und","fre,fra,eng");
 
 var lang_prio_dyn = new Array(); //Used for dynamic audio track selection
-var subs_prio_dyn = new Array(); //Used for dynamic audio track selection
+var subs_prio_dyn = new Array(); //Used for dynamic subs track selection
+
 
 var ChanGroup = Number(String((currChan / 1000)).substring(0,1)); // default group
 var minChan = new Array();var minchan = new Array(); var maxChan = new Array(); var defChan = new Array(); var baseChn = new Array(); var protChn = new Array(); var ServerAdres = new Array(); // Define settings for Channels.
-- 
cgit v1.2.3