Some changes for the 19x3

3 files changed, 57 insertions, 57 deletions

diff --git a/History b/History
index ee8f327..6022eab 100644
--- a/History
+++ b/History
@@ -1,3 +1,5 @@
+Tested on Motorola Vip : 1960 (with and without HDD), 1910, 1903.
+
 0.17	Show EPG from Server limited to X days ( 3 = default, set in settings.js)
 	Updated Mainmenu. For now Recordings = Server Recordings menu item.
 	Updated EPG-Schedule view, for every item a switch timer can be set. With up/down scrolling through Schedule is possible
@@ -6,6 +8,7 @@
 	Set timer for local recording.
 	Fixed crash when no EPG and users presses up/down
 	Small fixes OSD display, Schedule, SwitchTimer
+	Small fix to make it work on 19x3. (Looks like 19x0 auto selects right font)
 
 0.16	EPG/schedule info remove on channel switch
 	Exit Guide View removes epg/schedule info
diff --git a/index.html b/index.html
index c855091..61cebc7 100644
--- a/index.html
+++ b/index.html
@@ -37,21 +37,6 @@ for (var x = 0;  x < 10; x++) {
 window.onkeydown = onKeyDown;
 
 function onLoad() {
-/*
-	//Searching for a way to get recordings ID.
-	var x = toi.assetManagerService.getDefinedProperties();
-	alert(x.length);
-  for (var i=0; i<x.length; i++) {
-	alert(x[i]);
-	}
-	alert(toi.assetManagerService.getDirectories(-1));
-	var x = toi.assetManagerService.getDirectories(-1);
-	alert(x.length);
-  for (var i=0; i<x.length; i++) {
-	alert(x[i]);
-	}
-*/
-
 	createPlayer();
 	createRecorder();
 	embedTeletextPlugin();
@@ -128,8 +113,10 @@ function onUnload() {
 		mediaPlayer.stopTimeshiftBuffering();
 		mediaPlayer.discardTimeshiftBuffer();
 		}
+	if(mediaRecorder){
 		mediaRecorder.close();
 		mediaRecorder.releaseInstance();
+	}
 	toi.informationService.removeEventListener(toi.informationService.ON_OBJECTS_CHANGED, onEvent);
 	eitCache.removeEventListener(eitCache.ON_CACHE_UPDATED, onCacheUpdated);
 	mediaPlayer.removeEventListener(mediaPlayer.ON_DATA_AVAILABLE,onDataAvailableEvent);
@@ -167,16 +154,19 @@ function createPlayer() {
   }
 }
 
+
 function createRecorder() {
-	alert("createRecorder()");
 	try {
-		mediaRecorder = toi.mediaService.createRecorderInstance();
+		// no recorder support yet 
+		// mediaRecorder = toi.mediaService.createRecorderInstance();
+		//
 	} catch(e) {
 		alert("Cannot create media recorder: " + e);
 		mediaRecorder = "";
 	}
 }
 
+
 function play(uri) {
   try {
 	if (initialDelayID != -1) {
@@ -1553,13 +1543,19 @@ function onKeyMenu(keyCode) {
 	InitMenu(menu);
 	break;
 	case KEY_2:
+	//	if (menu == 0) {
+	//		isSetupMenu = 0;
+	//		mediaList.style.opacity = 0.9;
+	//		mainmenu.style.opacity = 0;
+	//		recPath = "/recordings.xml";
+	//		setTimeout("getRecList();LoadMediaSettings();",100);
+	//	}
 		if (menu == 0) {
-			isSetupMenu = 0;
-			mediaList.style.opacity = 0.9;
-			mainmenu.style.opacity = 0;
-			recPath = "/recordings.xml";
-			setTimeout("getRecList();LoadMediaSettings();",100);
+			LoadTimers();
+				if (timer.length !== 0) { do { timerID = timerID + 1; } while (!timer[timerID] && (timerID < timer.length)) }
+			menu = 2;
 		}
+
 		if (menu == 1) {
 			is = toi.informationService;
 			if(substype == 0 ) { 	
@@ -1573,11 +1569,12 @@ function onKeyMenu(keyCode) {
 		InitMenu(menu);
 	break;
 	case KEY_3:
-		if (menu == 0) {
-			LoadTimers();
-				if (timer.length !== 0) { do { timerID = timerID + 1; } while (!timer[timerID] && (timerID < timer.length)) }
-			menu = 2;
-		} else if (menu == 1) {
+	if (menu == 0) {
+			isSetupMenu = 0;
+			mediaList.style.opacity = 0.9;
+			mainmenu.style.opacity = 0;
+			setTimeout("getSchedule(currChan);LoadMediaSettings();",100);
+	} else	if (menu == 1) {
 			is = toi.informationService;
 			if(subsmode == 0 ) {	
 				is.setObject("cfg.media.subtitling.modepriority","Teletext,DVB",is.STORAGE_VOLATILE);
@@ -1590,12 +1587,15 @@ function onKeyMenu(keyCode) {
 	InitMenu(menu);
 	break;
 	case KEY_4:
-	if (menu == 0) {
+		if (menu == 0) {
 			isSetupMenu = 0;
 			mediaList.style.opacity = 0.9;
 			mainmenu.style.opacity = 0;
-			setTimeout("getSchedule(currChan);LoadMediaSettings();",100);
-			} else if (menu == 1) {
+			recPath = "/recordings.xml";
+			setTimeout("getRecList();LoadMediaSettings();",100);
+		}
+
+		 if (menu == 1) {
 			audiotype = audiotype + 1;
 			is = toi.informationService;
 			if(audiotype == 1) {	
@@ -1611,12 +1611,12 @@ function onKeyMenu(keyCode) {
 	break;
 	case KEY_5:
 		if (menu == 0) {
-			isSetupMenu = 0;
-			mediaList.style.opacity = 0.9;
-			mainmenu.style.opacity = 0;
-			recPath = "/recordings.xml";
-			setTimeout("getRecList();LoadMediaSettings();",100);
+			mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> Timers </center></h1><pre style='color:black;font-size:" + fsMenu + ";'>\n\n\n<center> PLEASE WAIT </center></pre>";
+			timerID = 0;
+			menu = 5;
+			setTimeout("LoadTimersServer();InitMenu(menu);",100);
 		}
+
 	if (menu == 1) {
 			audio = audio + 1;
 			is = toi.informationService;
@@ -1632,12 +1632,13 @@ function onKeyMenu(keyCode) {
 	InitMenu(menu);
 	break;
 	case KEY_6:
-		if (menu == 0) {
-			mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> Timers </center></h1><pre style='color:black;font-size:" + fsMenu + ";'>\n\n\n<center> PLEASE WAIT </center></pre>";
-			timerID = 0;
-			menu = 5;
-			setTimeout("LoadTimersServer();InitMenu(menu);",100);
-		}
+	if (menu == 0) {
+			isSetupMenu = 0;
+			mediaList.style.opacity = 0.9;
+			mainmenu.style.opacity = 0;
+			setTimeout("getServerSchedule();LoadMediaSettings();",100);
+			}
+
 	if (menu == 1) {
 		if(showClock == 0 )	{
 		 	showDisplay("", true, 80, 1 );
@@ -1650,13 +1651,15 @@ function onKeyMenu(keyCode) {
 	InitMenu(menu);
 	break;
 	case KEY_7:
-	if (menu == 0) {
+		if (menu == 0) {
 			isSetupMenu = 0;
 			mediaList.style.opacity = 0.9;
 			mainmenu.style.opacity = 0;
-			setTimeout("getServerSchedule();LoadMediaSettings();",100);
+			recPath = "/media.xml";
+			setTimeout("getRecList();LoadMediaSettings();",100);
 			}
 
+
 		if (menu == 1) {
 		ShowProtectedChannels = 1 - ShowProtectedChannels;
 		if (ShowProtectedChannels == 1 && protChn[ChanGroup] == 1) { ChanGroup = 0; currChan = defChan[ChanGroup]; play(currChan); }
@@ -1666,14 +1669,6 @@ function onKeyMenu(keyCode) {
 		}
 	break;
 	case KEY_8:
-		if (menu == 0) {
-			isSetupMenu = 0;
-			mediaList.style.opacity = 0.9;
-			mainmenu.style.opacity = 0;
-			recPath = "/media.xml";
-			setTimeout("getRecList();LoadMediaSettings();",100);
-			}
-
 	if (menu == 1) {
 		if(SwitchGuide == 0 )	{
 			SwitchGuide = 1;
@@ -1687,12 +1682,10 @@ function onKeyMenu(keyCode) {
 		if (menu == 0 || menu == 3) {
 		menu = 3;
 		playMPD(MPDAddress);
-		InitMenu(menu);
 		} else if (menu == 1) {
 		menu = 4; // INFO menu
-		InitMenu(menu);
 		}
-
+		InitMenu(menu);
 	break;
 	case KEY_0:
 		if (menu !== 0) {
@@ -1731,7 +1724,9 @@ function onKeyMenu(keyCode) {
 function InitMenu(menu) {
 
 if(menu == 0) { // Main Menu
-	mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> MainMenu \n ( " + Version + " )</center></h1><pre style='color:black;font-size:" + fsMenu + ";'>   1 - Settings \n   2 - Recordings\n   3 - Timers\n   4 - EPG\n   5 - Server : Recordings\n   6 - Server : Timers\n   7 - Server : EPG\n   8 - Server : Media Directory\n   9 - MPD Server Connection\n\n   BLUE - Restart Portal </pre>";
+	mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> MainMenu \n ( " + Version + " )</center></h1><pre style='color:black;font-size:" + fsMenu + ";'>   1 - Settings \n   2 - Timers\n   3 - EPG\n   4 - Server : Recordings\n   5 - Server : Timers\n   6 - Server : EPG\n   7 - Server : Media Directory\n\n   9 - MPD Server Connection\n\n   BLUE - Restart Portal </pre>";
+//	mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> MainMenu \n ( " + Version + " )</center></h1><pre style='color:black;font-size:" + fsMenu + ";'>   1 - Settings \n   2 - Recordings\n   3 - Timers\n   4 - EPG\n   5 - Server : Recordings\n   6 - Server : Timers\n   7 - Server : EPG\n   8 - Server : Media Directory\n   9 - MPD Server Connection\n\n   BLUE - Restart Portal </pre>";
+
 }
 
 if(menu == 1) { // settings menu
@@ -1942,9 +1937,9 @@ function playMPD(uri) {
     if (mediaPlayer.getState() != mediaPlayer.STATE_IDLE) {
       mediaPlayer.close();
     }
+	MPDListener = 1;
 	mediaPlayer.open(uri);
 	mediaPlayer.play(1000);
-	MPDListener = 1;
   } catch (e) {
     alert("Failed opening recording: " + e);
     return;
@@ -2839,7 +2834,7 @@ function ClearScreen() {
 
 	<div id="chanlistepg" style="width:42%; position:absolute; left:7%; top:50%;"> 	</div>
 
-	<videoplane id='videoplane' style='position:absolute; left:0px; top:0px; height: 100%; width: 100%; z-index:500;'></videoplane>
+	<videoplane id='videoplane' style='position:absolute;left:0px;top:0px;height:100%;width:100%;z-index:500;'></videoplane>
 
 	<div id="osdvolume" style="width:63%; position:absolute; left:10%; top:80%;z-index:501;font-family:'VDRSymbols Sans';opacity:0;">Volume : </div>
 	<div id="osdmedia" style="background:#3366ff;-webkit-border-radius:50px;width:80%; position:absolute; left:10%; top:70%;z-index:505;opacity:0;"></div>
diff --git a/settings.js b/settings.js
index f2444f7..091cbde 100644
--- a/settings.js
+++ b/settings.js
@@ -173,6 +173,8 @@ var fsKeys = (19*Yfactor) + "px";
 var AudioInfo = new Array();
 var xx = 0;
 
+var pipPlayer = "";
+var mediaRecorder = "";
 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"