Some bugfixes

4 files changed, 33 insertions, 21 deletions

diff --git a/History b/History
index 5ce2026..65229ef 100644
--- a/History
+++ b/History
@@ -1,3 +1,12 @@
+0.15	ChannelGroup settings moved from settings to channelsX.js
+	Removed display timeout from EPG info in channels view
+	Restart portal only from MENU, in normal view Blue gives epginfo
+	channelsX.js template on files section on project page
+	Protection ON jumps to ChannelGroup 0 & last played channel if protection is set for current channelgroup.
+	Fix left & right skips protected channel group
+	Bugfix displaying recordingsmenu (No more crash when delete last recording and press down)
+
+
 0.14	Resume, VDR (disk)status added (Uses "VDR on SmartTV" plugin)
 	Switch timer sets ChannelGroup.
 	When playing recordings key '0' rewinds to start of the recording.
diff --git a/channels1.js b/channels1.js
index 70446c6..a93938d 100644
--- a/channels1.js
+++ b/channels1.js
@@ -4,7 +4,7 @@
 minChan[1] = 1001;
 defChan[1] = 1001;
 baseChn[1] = 1000;
-protChn[1] = 0;
+protChn[1] = 1;
 ServerAdres[1] = server_ip + ":3000/";
 
 channelsnames[1001] = "NED1 HD (S)"
diff --git a/channels5.js b/channels5.js
index 9aa4dca..5511ce3 100644
--- a/channels5.js
+++ b/channels5.js
@@ -4,9 +4,9 @@
 
 // MultiCast
 minChan[5] = 5001;
-defChan[5] = 5001;
+defChan[5] = 5009;
 baseChn[5] = 5000;
-protChn[5] = 0;
+protChn[5] = 1;
 ServerAdres[5] = "MultiCast";
 // MultiCast, channels[x] layout DVB(Satposition, C or T)-NID-TID-SID-multicast address
 
@@ -27,8 +27,8 @@ channelsnames[5007] = "RTL7 (S)";
 channels[5007] = "S19.2E-53-1097-2006-239.255.0.7:11111";
 channelsnames[5008] = "Veronica/DisneyXD (S)";
 channels[5008] = "S19.2E-53-1097-2031-239.255.0.8:11111";
-channelsnames[5009] = "NET5 (S)";
-channels[5009] = "S19.2E-53-1105-4003-239.255.0.9:11111";
+channelsnames[5009] = "Live Stream TEST";
+channels[5009] = "Internet-0-0-0-http://mp3.webradio.antenne.de";
 
 maxChan[5] = 5009; // set to max multicast channel else you see 'undefined' in guide view
 
diff --git a/index.html b/index.html
index 972bc47..b797590 100644
--- a/index.html
+++ b/index.html
@@ -50,6 +50,7 @@ function onLoad() {
 //	eitCache.setFilterMode(eitCache.FILTER_MODE_PF_ONLY);
 	eitCache.addEventListener(eitCache.ON_CACHE_UPDATED, onCacheUpdated);
 	mediaPlayer.addEventListener(mediaPlayer.ON_DATA_AVAILABLE,onDataAvailableEvent);
+	mediaPlayer.addEventListener(mediaPlayer.ON_STATE_CHANGED, MPD); 
 	if (mediaRecorder) {
 	mediaRecorder.addEventListener(mediaRecorder.ON_STATE_CHANGED, onRecorderStateChanged);
 	}
@@ -118,6 +119,7 @@ function onUnload() {
 	toi.informationService.removeEventListener(toi.informationService.ON_OBJECTS_CHANGED, onEvent);
 	eitCache.removeEventListener(eitCache.ON_CACHE_UPDATED, onCacheUpdated);
 	mediaPlayer.removeEventListener(mediaPlayer.ON_DATA_AVAILABLE,onDataAvailableEvent);
+	mediaPlayer.removeEventListener(mediaPlayer.ON_STATE_CHANGED, MPD); 
 	mediaRecorder.removeEventListener(mediaRecorder.ON_STATE_CHANGED, onRecorderStateChanged);
 
 	} catch(e) {
@@ -210,7 +212,7 @@ function preview(urip) {
 
 function onDataAvailableEvent(event) {
 	dataAvailable = event.status;
-	
+	//alert("onDataAvailableEvent : " + event.status);
 	if(event.status==true) {
 		updateStreamInfo();
 	} 
@@ -358,10 +360,9 @@ function onKeyDown(event) {
 	defChan[ChanGroup] = currChan;
 	do
 		{
-		ChanGroup = ChanGroup - 1;
-		if (protChn[ChanGroup] == 1 && ShowProtectedChannels == 1) {
+		do
 			ChanGroup = ChanGroup - 1;
-			}
+		while (protChn[ChanGroup] == 1 && ShowProtectedChannels == 1) 
 		if (ChanGroup < 0) {
 			ChanGroup = 9;
 			}
@@ -390,10 +391,9 @@ function onKeyDown(event) {
 	defChan[ChanGroup] = currChan;
 	do
 		{
-		ChanGroup = ChanGroup + 1;
-		if (protChn[ChanGroup] == 1 && ShowProtectedChannels == 1) {
+		do
 			ChanGroup = ChanGroup + 1;
-			}
+		while (protChn[ChanGroup] == 1 && ShowProtectedChannels == 1)
 		if (ChanGroup > 9) {
 			ChanGroup = 0;
 			}
@@ -1445,13 +1445,13 @@ function onKeyMenu(keyCode) {
   switch(keyCode) {
     case "BrowserBack":
 	if (menu !== 0) {
-		if (menu == 3 ) { isFullscreen = 0; play(channels[currChan]); isFullscreen = 1; mediaPlayer.removeEventListener(mediaPlayer.ON_STATE_CHANGED, MPD);MPDListener = 0;}
+		if (menu == 3 ) { isFullscreen = 0; play(channels[currChan]); isFullscreen = 1;MPDListener = 0;}
 		menu = 0;	
 		InitMenu(menu);
 		break;
 		}
     case "Menu":
-	if (menu == 3 ) { play(channels[currChan]); mediaPlayer.removeEventListener(mediaPlayer.ON_STATE_CHANGED, MPD);MPDListener = 0;}
+	if (menu == 3 ) { play(channels[currChan]);MPDListener = 0;}
 	isSetupMenu = 0;
 	mainmenu.style.opacity = 0;
     break;
@@ -1615,7 +1615,7 @@ function onKeyMenu(keyCode) {
 	case KEY_7:
 		if (menu == 1) {
 		ShowProtectedChannels = 1 - ShowProtectedChannels;
-		if (ShowProtectedChannels == 1) { ChanGroup = 0; currChan = defChan[ChanGroup]; play(currChan); }
+		if (ShowProtectedChannels == 1 && protChn[ChanGroup] == 1) { ChanGroup = 0; currChan = defChan[ChanGroup]; play(currChan); }
 		isSetupMenu = 0;
 		mainmenu.style.opacity = 0;
 //		InitMenu(menu);
@@ -1647,7 +1647,7 @@ function onKeyMenu(keyCode) {
 	break;
 	case KEY_0:
 		if (menu !== 0) {
-		if (menu == 3 ) { isFullscreen = 0; play(channels[currChan]); isFullscreen = 1; mediaPlayer.removeEventListener(mediaPlayer.ON_STATE_CHANGED, MPD);MPDListener = 0;}
+		if (menu == 3 ) { isFullscreen = 0; play(channels[currChan]); isFullscreen = 1; MPDListener = 0;}
 		menu = 0;	
 		InitMenu(menu);
 		}
@@ -1756,7 +1756,7 @@ if(menu == 5) { // Timers from Server
 	if (timerOK) {
 	booking = "<font style='background:#fc5;-webkit-border-radius:25px;color:black;font-size:" + fsMenu + ";'>";
 	var x = timerID - 1;
-	for (var i=0;i<10;i++) {
+	for (var i=0;i<11;i++) {
 		if (timers.length !== 0) { do { x = x + 1; } while (!timers[x] && (x < timers.length)) }
 		if (timers.length > x) { booking = booking + timers[x]; } else { booking = booking +"\n"; }
 		if (i == 0) { booking = booking + "</font>"; } 
@@ -1862,8 +1862,11 @@ try {
 // MPD Section
 
 function MPD(ev) {
-//    alert("Media player state changed: state=" + ev.state + ", reason=" + ev.reason + ", code=" + ev.code);
-
+    // alert("Media player state changed: state=" + ev.state + ", reason=" + ev.reason); //  + ", code=" + ev.code);
+if (MPDListener == 0) {
+	if (ev.state == 6 ) { showDisplay("ERRR", false, 100, 0 ); }
+	
+} else {
 	if ( ev.state == 6 && ev.reason == "HostUnreachable" ) {
 	    showDisplay("ERRR", false, 100, 0 );
 	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 \n   9 - Retry \n\n<center style='color:white;'>ERROR Connecting to MPD server : \n" + MPDAddress + "</center></pre>";
@@ -1877,6 +1880,7 @@ function MPD(ev) {
 	    showDisplay("ERRR", false, 100, 0 );
 	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 \n   9 - Reconnect \n\n<center style='color:white;'>Error : " + ev.state + "\n Reason : " + ev.reason + "</center></pre>";
 	}
+}
 
 }
 
@@ -1887,7 +1891,6 @@ function playMPD(uri) {
     }
 	mediaPlayer.open(uri);
 	mediaPlayer.play(1000);
-	if (!MPDListener) {	mediaPlayer.addEventListener(mediaPlayer.ON_STATE_CHANGED, MPD); }
 	MPDListener = 1;
   } catch (e) {
     alert("Failed opening recording: " + e);
@@ -2435,7 +2438,7 @@ function showMediaList() {
 
 function incMed(step) {
     currMed = currMed + step;
-    if (currMed == nrMedia + 1) {
+    if (currMed > nrMedia ) {
         currMed = 0;
     }
 }