From 433b151d99aa21da128d0477857a4c7035793034 Mon Sep 17 00:00:00 2001
From: "M. Voerman" <rekordc@gmail.com>
Date: Sun, 1 Nov 2015 22:38:00 +0100
Subject: DLNA testing

---
 History                |  4 +++-
 index.html             |  1 +
 javascript/dlna.js     | 11 +++++++++--
 javascript/main.js     | 36 +++++++++++++++++++-----------------
 javascript/settings.js |  2 --
 5 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/History b/History
index 2cf72a6..a9d147d 100644
--- a/History
+++ b/History
@@ -25,7 +25,9 @@ VDR 1.7.29+
 	Epg info update for non C/T/S channels
 	Changed key word 'FullURL' to 'IPTV'
 	Finnish translation by Tomas Nybondas
-	Menu time out, menu is removed 1 minute after last key press (not for MPD menu)
+	Menu time out, menu is removed 1 minute after last key press (not for MPD menu or recordings)
+	(un)Mute external speakers with << or >> within menu (was experimental and settings menu only)
+
 
 
 
diff --git a/index.html b/index.html
index c84cd16..7f6bfac 100644
--- a/index.html
+++ b/index.html
@@ -8,6 +8,7 @@
 <script type="text/javascript" src="javascript/main.js"></script>
 <script type="text/javascript" src="javascript/weather.js"></script>
 <script type="text/javascript" src="javascript/news.js"></script>
+<script type="text/javascript"> /* src="javascript/dlna.js" */ </script>
 <script type="text/javascript">
 
 /***********************************************************/
diff --git a/javascript/dlna.js b/javascript/dlna.js
index cd4bbb2..f9dd44f 100644
--- a/javascript/dlna.js
+++ b/javascript/dlna.js
@@ -1,3 +1,6 @@
+//
+// Note to self : root directory : ./minidlnad -v -d -p 999 -f minidlna.conf 
+//
 var cdsService;
 var operationManager;
 var resultData;
@@ -14,7 +17,7 @@ function initDLNAPlugin() {
 
 // Get mediaserver
 function find_dlna() {
-	Dlna_serverId = toi.DlnaService.getMediaServers();
+	Dlna_serverId = toi.dlnaService.getMediaServers();
 	alert(Dlna_serverId[0]);
 
 }
@@ -55,6 +58,7 @@ function onOperationResult(event) {
       }
       // Break loop if all objects are fetched
       if (!resultData.hasMore) {
+	alert(i);
         break;
       }
     }
@@ -86,6 +90,10 @@ function openItem(itemIndex) {
 
   // Get the value for PROPERTY_RES
   for (var i = 0; i< item.properties.length; i++) {
+alert(item.properties[i]);
+alert(item.properties[i].id);
+alert(item.properties[i].value);
+
     if (item.properties[i].id == cdsService.PROPERTY_RES) {
       url_dlna = item.properties[i].value;
     }
@@ -98,7 +106,6 @@ function openItem(itemIndex) {
   if (classTypes[2] == "audioItem") {
     // Play the item url
     try {
-	alert(url_dlna);
 //      player.open(url_dlna);
 //      player.play(1000);
     }
diff --git a/javascript/main.js b/javascript/main.js
index dad01dc..74e4b2d 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -108,8 +108,7 @@ function onLoad() {
 	}
 
 	if (Use_DLNA) {
-		//		initDLNAPlugin();
-		//		find_dlna();
+				initDLNAPlugin();
 	}
 }
 
@@ -222,7 +221,8 @@ function GetSettings() {
 	loadjs(conf_dir + MACaddress + ".js");
 
 	experimental = Number(is.getObject("vip.testing"));// Use some experimental code
-	testing2 = Number(is.getObject("vip.testing2"));// Use some experimental code
+	experimental2 = Number(is.getObject("vip.testing2"));// Use some experimental code
+	experimental3 = Number(is.getObject("vip.testing3"));// Use some experimental code
 
 	ShowSubs = Number(is.getObject("vip.showsubs"));
 	css_nr = Number(is.getObject("vip.css_nr"));
@@ -707,7 +707,7 @@ function ExtraStuff(){
 	if(TimeShift){
 	    initialDelayID = setTimeout("startTimeshiftBuffering();", 5000);
 	}
-	if(testing2) {
+	if(experimental2) {
 			if (CAdelayID != -1) { clearTimeout(CAdelayID); CAdelayID = -1; switchtimer.style.opacity = 0;}
 		if ( 	(currChan > 10 && currChan < 26 )  || (currChan > 40 && currChan < 50 )   || (currChan > 50 && currChan < 120 ) ||
 			(currChan > 151 && currChan < 200) || (currChan > 604 && currChan < 612 ) || (currChan > 624 && currChan < 631) ||
@@ -1498,7 +1498,7 @@ function onCacheUpdated() {
 
 function OSDchannr(channr) {
 //	Show logo's
-	if (experimental) {
+	if (experimental3) {
 		//osdlogo.innerHTML = "<img src='experimental/logo/" + channels[currChan] + ".png' >";
 	}
 	osdnr.innerHTML = "<span class=osdnr" + cssres[css_nr][Set_Res] + ">" + Right(channr,3) + "</span>";
@@ -2626,17 +2626,10 @@ function onKeyMenu(keyCode) {
 	}
     break;
     case "MediaRewind":
-	 if (menu == 1) {
-		if (experimental) { // mute output 0 (analog out), keep output 3 'decoder output' unmuted
-			aos.setVolume(0, 0); 
-			}
-	}
+	aos.setVolume(0, 0); // Mute external speakers
     break;
     case "MediaForward":
-	 if (menu == 1) {
-		if (experimental) { aos.setVolume(0, 100); }
-	}
-
+	aos.setVolume(0, 100); // Unmute external speakers
     break;
     case "MediaStop":
 	if (menu == 1) {
@@ -2663,6 +2656,15 @@ function onKeyMenu(keyCode) {
 	InitMenu(menu);
     break;
     case "Teletext":
+	if (Use_DLNA) {
+		find_dlna();
+		if (Dlna_serverId[0]) {
+			setup(Dlna_serverId[0]);
+			browse("64");
+			openItem("0");
+		}
+	}
+
     break;
     case "TV":
     break;
@@ -3110,11 +3112,11 @@ if(menu == 9) { // INFO2 Menu
 
 		experimental = Number(is.getObject("vip.testing"));
 		if (experimental) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
-		htmltext += "Experimental";
+		htmltext += "Experimental (Debug Connection Error)";
 		if (Number(is.getObject("vip.testing2"))) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
 		htmltext += "Experimental 2 (Info box 'not in package')";
 		if (Number(is.getObject("vip.testing3"))) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
-		htmltext += "Experimental 3 (Unused)";
+		htmltext += "Experimental 3 (Unused, show logo's)";
 
 		if (Restfulapiplugin) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
 		htmltext += "Has Restfulapiplugin"
@@ -4942,7 +4944,7 @@ function getSchedule(schchan){
 
 	medialist.innerHTML = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + ">" + Lang[11] + "<pre>\n\n\n" + Lang[52] + "</pre></h1>";
 
-	if (experimental) {
+	if (experimental3) {
 	medialist.innerHTML += "<img src='experimental/" + channels[schchan] + ".jpg' style='width:100%; position:absolute; left:0%; top:-11%;'>";
 	}
 
diff --git a/javascript/settings.js b/javascript/settings.js
index b27feda..a862d37 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -119,9 +119,7 @@ var afterRecTime = 600 ; // for local recordings time after recording in seconds
 // No need to change anything from here on.
 //
 
-var experimental;// Use some experimental code
 var lang_nr;
-var testing2;
 var ShowSubs; //Flash stored
 
 VideoOutputModes = new Array(4,5,7); // Modes for the portal.
-- 
cgit v1.2.3