Some fixes for streaming errors.

Direct recording if no EPG event done by Restfulapi

4 files changed, 44 insertions, 21 deletions

diff --git a/index.html b/index.html
index 9c83c27..d856825 100644
--- a/index.html
+++ b/index.html
@@ -3235,10 +3235,20 @@ function MPD(ev) {
 //     alert("Media player error :" + mediaPlayer.getError().details);
 if (MPDListener == 0) {
 	if (ev.state == 6 ) { 
-		alert("Media player state changed: state=" + ev.state + ", reason=" + ev.reason + ", code=" + ev.code);
-		showDisplay("ERRR", false, 100, 0 ); 
-		settimer(0,Lang[67],0,2);
+		if (ev.reason == "CommandClose" && ErrorAgain == 0) {
+			setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",500);
+			ErrorAgain = 1;
+		} else {
+			ErrorAgain = 0;
+			alert("Media player state changed: state=" + ev.state + ", reason=" + ev.reason + ", code=" + ev.code);
+			showDisplay("ERRR", false, 100, 0 ); 
+			if (experimental) {
+				settimer(0,ev.reason,0,2);
+			} else {
+				settimer(0,Lang[67],0,2);
+			}
 		}
+	}
 	
 } else {
 	if ( ev.state == 6 && ev.reason == "HostUnreachable" ) {
@@ -4400,35 +4410,46 @@ function ServerRecordStart() {
 	   xmlhttp.send();
 
 		if (xmlhttp.responseXML == null) {
-		    settimer(EPG[NowNext][2][currChan],Lang[55],0,2);
+		    //settimer(EPG[NowNext][2][currChan],Lang[55],0,2);
+		    //Timer not set, try direct recording
+		    ServerRecord();
+		    settimer(0,Lang[57],0,2);
 		} else {
 		   settimer(EPG[NowNext][2][currChan],EPG[NowNext][1][currChan],0,2);
 		}
 
 	  } catch(e) {
 	    alert("Sending Timers to server problem: " + e);
+	    settimer(0,Lang[55],0,2);
 	  }
 
 }
 
-function ServerPause() {
-//Instant pause on server
+
+function ServerRecord() {
+//Instant record on server
 
   try {
-   xmlhttp=new XMLHttpRequest();
+	xmlhttp=new XMLHttpRequest();
 	//switch server to current channel
-   xmlhttp.open("POST",(server_ip + RestFulAPI + "/remote/switch/" + channels[currChan]),true);
-   xmlhttp.send();
-	//start pause
-   setTimeout("xmlhttp.open('POST',(server_ip + RestFulAPI + '/remote/Record'),false);xmlhttp.send();",5000);
-
-	//Show some info on screen
-   settimer(EPG[NowNext][2][currChan],Lang[70],0,2);
-
+	xmlhttp.open("POST",(server_ip + RestFulAPI + "/remote/switch/" + channels[currChan]),true);
+	xmlhttp.send();
+	//start recording
+	setTimeout("xmlhttp.open('POST',(server_ip + RestFulAPI + '/remote/Record'),false);xmlhttp.send();",5000);
   } catch(e) {
-   alert("Sending Pause key to server problem: " + e);
+   alert("Sending key to server problem: " + e);
+   settimer(0,Lang[55],0,2);
   }
 
+//end of function
+}
+
+
+
+function ServerPause() {
+//Instant pause on server
+	ServerRecord();
+	settimer(EPG[NowNext][2][currChan],Lang[70],0,2);
 	setTimeout("getPauseFile();",6000);
 //end of function
 }
diff --git a/lang_dut.js b/lang_dut.js
index ab17d2a..09e1998 100755
--- a/lang_dut.js
+++ b/lang_dut.js
@@ -95,7 +95,7 @@ Lang[53] = " Problemen met het opvragen van de EPG !!! ";
 Lang[54] = " Minuten ";
 Lang[55] = "FOUT met instellen opname";
 Lang[56] = "Min.";
-
+Lang[57] = "Opname gestart";
 
 Lang[60] = " MPD Verbinding ";
 Lang[61] = " Opnieuw ";
diff --git a/lang_eng.js b/lang_eng.js
index 5fde397..0b41fb2 100755
--- a/lang_eng.js
+++ b/lang_eng.js
@@ -95,6 +95,7 @@ Lang[53] = " ERROR getting EPG !!! ";
 Lang[54] = " Minutes ";
 Lang[55] = "ERROR starting recording";
 Lang[56] = "Min.";
+Lang[57] = "Recording started";
 
 Lang[60] = " MPD Connection ";
 Lang[61] = " Retry ";
@@ -115,4 +116,5 @@ Lang[85] = " Move Down ";
 Lang[86] = " ADD ";
 Lang[87] = " Delete ";
 
+
 Lang[90] = "No subscription for this channel";
diff --git a/settings.js b/settings.js
index 82c89d6..5480849 100644
--- a/settings.js
+++ b/settings.js
@@ -2,9 +2,9 @@
 // Default settings
 // 
 
-var Version = "0.24.21";
+var Version = "0.24.22";
 
-server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21");
+server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://easyvdr","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21","http://192.168.2.100","http://192.168.178.52");
 
 var server_ip = server_ip_array[0]; // default server
 var StartVolume = 15; // Volume on (re)start of the portal.
@@ -24,7 +24,7 @@ var UseNewReclist = 1 ; //use new recordingslist function
 var ShowSubDir = 1 ; // 0 = no, 1 = yes (default) // show seperate maps for subdirs in menu recordings
 var showClock = 0;   // 0 = no, 1 = yes
 var SwitchGuide = 0; // 0 = no, 1 = yes
-var PipSwitchGuide = 1; // 0 = no, 1 = yes // use second/pip player for getting epg update in guide view // !!Unstable!! box might restart
+var PipSwitchGuide = 0; // 0 = no, 1 = yes // use second/pip player for getting epg update in guide view // !!Unstable!! box might restart
 var TimeShift = 0;   // 0 = no, 1 = yes timeshift
 var KillStream = 1;  // 1 = Close stream on Standby
 var ShowProtectedChannels = 1; // 0 = yes show, 1 = don't show protected channels (default)
@@ -351,4 +351,4 @@ var URL;
 var initialDelayPlay = 0; 
 var PlayDelayID;
 var PIPDelayID;
-
+var ErrorAgain = 0;