Mainmenu expanded, selection of audiotype, substype etc

4 files changed, 81 insertions, 24 deletions

diff --git a/History b/History
index 99f02df..fcf6566 100644
--- a/History
+++ b/History
@@ -1,3 +1,8 @@
+0.06	More options in Main Menu:
+	Audio selection normal,hearing_impaired,visually_impaired (work around for some AC3 channels is to select Hearing_impaired which is still in mpeg)
+	cfg.media.subtitling.modepriority, cfg.media.subtitling.typepriority
+
+
 0.05	OSD 1920x1088 (16:9) // OSD 1280x720 (16:9) // OSD 704x576 (16:9) But should work on other size too.
 	EPG language routine expanded. More NIDs added.
 	Added toFixed on Schedule page.
diff --git a/index.html b/index.html
index a4ca4bb..edaffb9 100644
--- a/index.html
+++ b/index.html
@@ -48,6 +48,7 @@ function onLoad() {
 	eitCache.setFilterMode(eitCache.FILTER_MODE_PF_AND_SCHEDULE);
 //	eitCache.setFilterMode(eitCache.FILTER_MODE_PF_ONLY);
 	eitCache.addEventListener(eitCache.ON_CACHE_UPDATED, onCacheUpdated);
+	mediaPlayer.addEventListener(mediaPlayer.ON_DATA_AVAILABLE,onDataAvailableEvent);
 	showOSD();
 	colorkeys.style.fontSize = fsKeys;
 	colorkeys.innerHTML = "<font color=red>" +  NN[4] + "</font><font color=green >" + NN[1] + "</font><font color=yellow> Schedule </font><font color=blue> INFO </font>";
@@ -183,6 +184,44 @@ function preview(urip) {
 }
 
 
+function onDataAvailableEvent(event) {
+	dataAvailable = event.status;
+	
+	if(event.status==true) {
+		updateStreamInfo();
+	} 
+}
+
+
+function updateStreamInfo() {
+
+var streamInfo = mediaPlayer.getStreamInfo();
+var cList = streamInfo.availableComponents;
+var x;
+for(x=0; x<cList.length;x++) {
+alert ("XXX " + cList[x].type);
+	if(cList[x].type == 0) {
+	alert( mediaPlayer.getAudioStreamInfo(cList[x]).language);
+	alert( mediaPlayer.getAudioStreamInfo(cList[x]).audienceType);
+	alert( mediaPlayer.getAudioStreamInfo(cList[x]).channelFormat);
+	alert( mediaPlayer.getAudioStreamInfo(cList[x]).channelMode);
+	alert( mediaPlayer.getAudioStreamInfo(cList[x]).encoding);
+	alert( mediaPlayer.getAudioStreamInfo(cList[x]).sublanguage);
+	alert( mediaPlayer.getAudioStreamInfo(cList[x]).sampleRate);
+	}
+	if(cList[x].type == 1) {
+	alert(mediaPlayer.getVideoStreamInfo(cList[x]).aspectRatio);
+	alert(mediaPlayer.getVideoStreamInfo(cList[x]).activeFormatDescriptor);
+	}
+
+
+	}
+
+
+}
+
+
+
 function startTimeshiftBuffering() {
     // check that media player is working
     if (mediaPlayer.getState() != mediaPlayer.STATE_PLAYING ) {
@@ -1342,10 +1381,39 @@ function onKeyMenu(keyCode) {
 	InitMenu();
 	break;
 	case KEY_2:
+			is = toi.informationService;
+			if(substype == 0 ) { 	
+				is.setObject("cfg.media.subtitling.typepriority","hearing_impaired,normal",is.STORAGE_VOLATILE);
+				substype = 1;
+			} else {
+				is.setObject("cfg.media.subtitling.typepriority","normal,hearing_impaired",is.STORAGE_VOLATILE);
+				substype = 0;
+			}
+	InitMenu();
 	break;
 	case KEY_3:
+			is = toi.informationService;
+			if(subsmode == 0 ) {	
+				is.setObject("cfg.media.subtitling.modepriority","Teletext,DVB",is.STORAGE_VOLATILE);
+				subsmode = 1;
+			} else {
+				is.setObject("cfg.media.subtitling.modepriority","DVB,Teletext",is.STORAGE_VOLATILE);
+				subsmode = 0;
+			}
+	InitMenu();
 	break;
 	case KEY_4:
+			audiotype = audiotype + 1;
+			is = toi.informationService;
+			if(audiotype == 1) {	
+				is.setObject("cfg.media.audio.typepriority","normal,hearing_impaired,visually_impaired",is.STORAGE_VOLATILE);
+			} else if(audiotype == 2) {
+				is.setObject("cfg.media.audio.typepriority","hearing_impaired,visually_impaired",is.STORAGE_VOLATILE);
+			} else if(audiotype == 3) {
+				is.setObject("cfg.media.audio.typepriority","visually_impaired",is.STORAGE_VOLATILE);
+				audiotype = 0;
+			}
+	InitMenu();
 	break;
 	case KEY_5:
 	break;
@@ -1361,7 +1429,7 @@ function onKeyMenu(keyCode) {
 }
 
 function InitMenu() {
-	mainmenu.innerHTML = "<center><p style='font-size:" + fsMenuMain + ";color:white;'> SETTINGS </p><p style='color:red;font-size:" + fsMenu + ";'>Frontdisplay Clock : " + showClock + "</p><p style='color:green;font-size:" + fsMenu + ";'>Prio audio track : " + (toi.informationService.getObject("cfg.media.audio.languagepriority")) + "</p><p style='color:yellow;font-size:" + fsMenu + ";'>Switch timer : " + Boolean(switchtimerID) + "</p><p style='color:blue;font-size:" + fsMenu + ";'>Preview guide : " + SwitchGuide + "</p><p style='color:black;font-size:" + fsMenu + ";'>1 - Show Subs : " + Boolean(ShowSubs) + "</p></center>";
+	mainmenu.innerHTML = "<center><p style='font-size:" + fsMenuMain + ";color:white;'> SETTINGS </p><p style='color:red;font-size:" + fsMenu + ";'>Frontdisplay Clock : " + showClock + "</p><p style='color:green;font-size:" + fsMenu + ";'>Prio audio track : " + (toi.informationService.getObject("cfg.media.audio.languagepriority")) + "</p><p style='color:yellow;font-size:" + fsMenu + ";'>Switch timer : " + Boolean(switchtimerID) + "</p><p style='color:blue;font-size:" + fsMenu + ";'>Preview guide : " + SwitchGuide + "</p><p style='color:black;font-size:" + fsMenu + ";'>1 - Show Subs : " + Boolean(ShowSubs) + "</p><p style='color:black;font-size:" + fsMenu + ";'>2 - Subs Type Prio : " + (toi.informationService.getObject("cfg.media.subtitling.typepriority")) + "</p><p style='color:black;font-size:" + fsMenu + ";'>3 - Subs Mode Prio : " + (toi.informationService.getObject("cfg.media.subtitling.modepriority")) + "</p><p style='color:black;font-size:" + fsMenu + ";'>4 - Audio Type Prio : " + (toi.informationService.getObject("cfg.media.audio.typepriority")) + "</p></center>";
 }
 
 // End of Menu section
diff --git a/recordings.js b/recordings.js
index 2c92ce1..1444304 100644
--- a/recordings.js
+++ b/recordings.js
@@ -1,21 +1,3 @@
-recording[0] = "/mnt/00_Abony/%Tom_&_Jerry_Tales/2012-02-28.10.00.317-0.rec/00001.ts";
-recording[1] = "/mnt/000_Mpeg4/CSI:_Crime_Scene_Investigation/2012.11.09-22:15-Fr/2012-11-09.22.05.32-0.rec/00001.ts";
-recording[2] = "/mnt/000_Mpeg4/CSI:_Crime_Scene_Investigation/2012.11.09-23:10-Fr/2012-11-09.23.00.32-0.rec/00001.ts";
-recording[3] = "/mnt/000_Mpeg4/CSI:_Crime_Scene_Investigation/2012.11.16-23:45-Fr/2012-11-16.23.35.32-0.rec/00001.ts";
-recording[4] = "/mnt/000_Mpeg4/CSI:_NY/2012.10.28-20:45-So/2012-10-28.20.35.32-0.rec/00001.ts";
-recording[5] = "/mnt/000_Mpeg4/CSI:_NY/2012.11.11-20:45-So/2012-11-11.20.35.32-0.rec/00001.ts";
-recording[6] = "/mnt/000_Mpeg4/Castle/2012.10.26-21:25-Fr/2012-10-26.21.20.32-0.rec/00001.ts";
-recording[7] = "/mnt/000_Mpeg4/Castle/2012.11.02-21:25-Fr/2012-11-02.21.20.32-0.rec/00001.ts";
-recording[8] = "/mnt/000_Mpeg4/Castle/2012.11.09-21:25-Fr/2012-11-09.21.20.32-0.rec/00001.ts";
-recording[9] = "/mnt/000_Mpeg4/Castle/2012.11.16-22:55-Fr/2012-11-16.22.50.32-0.rec/00001.ts";
-recording[10] = "/mnt/Vermist/2012.12.12-22:25-Mi/2012-12-12.22.20.32-0.rec/00001.ts";
-recording[11] = "/mnt/00_Abony/%Tom_&_Jerry_Tales/2012-02-28.10.00.317-0.rec/00001.ts";
-recording[12] = "/mnt/00_Abony/2012.10.27-05:00-Sa/2012-10-27.05.00.12-0.rec/00001.ts";
-recording[13] = "/mnt/00_Abony/Bob_de_Bouwer/2012-11-13.09.25.8003-0.rec/00001.ts";
-recording[14] = "/mnt/00_Abony/Bob_de_Bouwer_(13)/2012-11-07.01.10.316-0.rec/00001.ts";
-recording[15] = "/mnt/00_Abony/Bob_de_Bouwer_(14)/2012-11-07.04.25.316-0.rec/00001.ts";
-recording[16] = "/mnt/00_Abony/Daffy_Duck/2012-03-14.15.25.328-0.rec/00001.ts";
-recording[17] = "/mnt/00_Abony/Dora/2012.10.25-05:00-Do/2012-10-25.05.00.12-0.rec/00001.ts";
-recording[18] = "/mnt/00_Abony/Dora/2012.10.26-05:00-Fr/2012-10-26.05.00.12-0.rec/00001.ts";
-recording[19] = "/mnt/00_Abony/Dora_the_Explorer/2012-05-28.13.00.319-0.rec/00001.ts";
+recording[0] = "No recordings. Sorry";
+recording[1] = "No recordings. Sorry";
 
diff --git a/settings.js b/settings.js
index 9b5a086..ad32c8d 100644
--- a/settings.js
+++ b/settings.js
@@ -135,10 +135,10 @@ var CAicon = "\uE00D";
 var fsAudio = (16*Yfactor) + "px";
 var fsTime = (16*Yfactor) + "px";
 var fsName = (27*Yfactor) + "px";
-var fsMenu = (24*Yfactor) + "px";
+var fsMenu = (20*Yfactor) + "px";
 var fsChan = (43*Yfactor) + "px"; 
 var fsCA = (32*Yfactor) + "px";
-var fsMenuMain = (48*Yfactor) + "px";
+var fsMenuMain = (40*Yfactor) + "px";
 var fsEpg = (19*Yfactor) + "px";
 var fsEpginfo = (21*Yfactor) + "px";
 var fsList = (18*Yfactor) + "px";
@@ -150,4 +150,6 @@ var fsMedia = (27*Yfactor) + "px";
 var fsKeys = (19*Yfactor) + "px";
 
 var isRecording = 0; // set by recording subroutine
-
+var audiotype = 0; // used for selecting "cfg.media.audio.typepriority","normal,hearing_impaired,visually_impaired"
+var subsmode = 0;  // "cfg.media.subtitling.modepriority","Teletext,DVB"
+var substype = 0;  // "cfg.media.subtitling.typepriority","normal,hearing_impaired"