From cbf6fc2f8772f97bf03c4b408b9fe229f7c5b6ed Mon Sep 17 00:00:00 2001
From: "M. Voerman" <rekordc@gmail.com>
Date: Tue, 15 Jan 2013 09:07:28 +0100
Subject: Revert "removed MPD connection because it didn't work or with lott of
 glitches in the playback"

This reverts commit 25d21a2d2a086cbd34bf02b47337aa5761fe3740.
---
 index.html  | 29 +++++++++++++++++++++++++----
 settings.js | 15 ++++++++-------
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html
index f34179b..eccb122 100644
--- a/index.html
+++ b/index.html
@@ -1663,7 +1663,9 @@ function onKeyMenu(keyCode) {
 	break;
 	case KEY_9:
 		if (menu == 0) {
-		//
+		menu = 3;
+		playMPD(MPDAddress);
+		InitMenu(menu);
 		} else if (menu == 1) {
 		menu = 4; // INFO menu
 		InitMenu(menu);
@@ -1704,11 +1706,26 @@ function onKeyMenu(keyCode) {
 }
 
 
+function playMPD(uri) {
+  try {
+    if (mediaPlayer.getState() != mediaPlayer.STATE_IDLE) {
+      mediaPlayer.close();
+    }
+	mediaPlayer.open(uri);
+	mediaPlayer.play(1000);
+	showDisplay("MPD", false, 100, 0 );
+  } catch (e) {
+    alert("Failed opening recording: " + e);
+    return;
+  }
+}
+
+
 
 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 - SettingsMenu \n   2 - Recordings \n   3 - TimersMenu\n\n\n\n\n\n\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 - SettingsMenu \n   2 - Recordings \n   3 - TimersMenu\n\n\n\n\n\n   9 - MPD Server Connection\n\n   BLUE - Restart Portal </pre>";
 }
 
 if(menu == 1) { // settings menu
@@ -1750,6 +1767,10 @@ if(menu == 2) { // Timers menu
 	mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> Timers </center></h1><pre style='color:black;font-size:" + fsMenu + ";'>\n   0 - MainMenu \n" + booking + "</pre>";
 }
 
+if(menu == 3) { // MPD Menu
+	mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> MPD Connection </center></h1><pre style='color:black;font-size:" + fsMenu + ";'> MENU to exit \n 0 - back to MainMenu </pre>";
+}
+
 if(menu == 4) { // INFO Menu
 	var htmltext = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> INFO </center></h1><pre style='color:black;font-size:" + fsMenu + ";'>";
 	try {
@@ -2024,8 +2045,8 @@ recDesc[0] = " ";
 recTitl[1] = "DVR";
 recLink[1] = "dvr:///pvr/storage/asset_bmyjD4";
 recDesc[1] = " ";
-recTitl[2] = "HTTP media avi file";
-recLink[2] = "http://192.168.3.15:8000/multimedia/video/The Island 2005/poster1.jpg";
+recTitl[2] = "HTTP Vermist";
+recLink[2] = "http://192.168.3.15/portal/webkit/video0/Vermist/2013.01.09-22:10-Mi/2013-01-09.22.05.43-0.rec/00001.ts";
 recDesc[2] = " ";
 recTitl[3] = "FILE Vermist";
 recLink[3] = "file://mnt/Vermist/2013.01.09-22:10-Mi/2013-01-09.22.05.43-0.rec/00001.ts";
diff --git a/settings.js b/settings.js
index 05376a0..2c69afc 100644
--- a/settings.js
+++ b/settings.js
@@ -6,8 +6,8 @@
 // 1280x720
 // 1920x1080
 
-var Xfactor = 1280 / 720;
-var Yfactor = 720 / 576;
+var Xfactor = 1920 / 720;
+var Yfactor = 1080 / 576;
 
 
 var showClock = 0;   // 0 = no, 1 = yes
@@ -34,7 +34,8 @@ var ChanGroup = 0; // default TV group
 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.
 
 // Server for Recordings
-var recServ = "http://192.168.3.15:8000";
+var recServ = "http://192.168.1.15:8000";
+var MPDAddress = "http://192.168.1.15:8888/mpd.mp3";
 
 // Radio channels.js Settings
 minChan[9] = 9001;
@@ -42,7 +43,7 @@ maxChan[9] = 9099; // set not too far from max rd channel to speed up zapping
 defChan[9] = 9051;
 baseChn[9] = 9000;
 protChn[9] = 0;
-ServerAdres[9] = "http://192.168.3.15:3000/";
+ServerAdres[9] = "http://192.168.1.15:3000/";
 
 // Protected channels.js Settings
 minChan[6] = 6001;
@@ -50,7 +51,7 @@ maxChan[6] = 6040; // set not too far from max prt channel to speed up zapping
 defChan[6] = 6001;
 baseChn[6] = 6000;
 protChn[6] = 1;
-ServerAdres[6] = "http://192.168.3.15:3000/";
+ServerAdres[6] = "http://192.168.1.15:3000/";
 
 // TV channels.js Settings
 minChan[0] = 1;
@@ -58,7 +59,7 @@ maxChan[0] = 999; // set not too far from max TV channel to speed up zapping
 defChan[0] = currChan;
 baseChn[0] = 0;
 protChn[0] = 0;
-ServerAdres[0] = "http://192.168.3.15:3000/";
+ServerAdres[0] = "http://192.168.1.15:3000/";
 
 //HD list
 minChan[1] = 1001;
@@ -66,7 +67,7 @@ maxChan[1] = 1999; // set not too far from max HD channel to speed up zapping
 defChan[1] = 1001;
 baseChn[1] = 1000;
 protChn[1] = 0;
-ServerAdres[1] = "http://192.168.3.15:3000/";
+ServerAdres[1] = "http://192.168.1.15:3000/";
 
 // MultiCast
 minChan[5] = 5001;
-- 
cgit v1.2.3