Zaptime delay

2 files changed, 21 insertions, 19 deletions

diff --git a/History b/History
index ce1d4cf..f566837 100644
--- a/History
+++ b/History
@@ -22,7 +22,7 @@ VDR 1.7.29+
 	Updated channels script, now adds timestamp to list which is shown in info menu.
 	EPG Mode can be set (Now/Next only or Full EPG from stream)
 	Client for MPD (http://www.musicpd.org/) turned off by default (settings.js) 
-	Timeout before playing the stream. Some times after fast zapping you get an connection error. Now play has 300 ms delay.
+	Timeout before playing the stream. Some times after fast zapping you get an connection error. Now play has 500 ms delay.
 	support for reccmds.conf (max 9 options can be used) and must be enabled in smarttvweb plugin
 		in recordings menu key_1 selects reccmds.conf option 1 (In my case move to other HDD script)
 
diff --git a/index.html b/index.html
index dbece5a..59c1989 100644
--- a/index.html
+++ b/index.html
@@ -473,30 +473,13 @@ function play(uri) {
 	}
 
 	URL = uri;
-	initialDelayPlayID = setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);",initialDelayPlay);
+	initialDelayPlayID = setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",initialDelayPlay);
 	SetLed(1,1,0);
 
-	if(TimeShift){
-	    initialDelayID = setTimeout("startTimeshiftBuffering();", 5000);
-	}
-
 	if(isFullscreen) {
 	showOSD();
 	}
 
-	if(testing2) {
-			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) ||
-			(currChan > 632 && currChan < 700) || (currChan > 8004 && currChan < 8027) )
-		{
-			//Show info if set nonfree
-			switchtimer.innerHTML = "<pre><center>\n" + Lang[90] +"\n\n </center></pre>"; // Non free channel message
-			switchtimer.style.opacity = 1;
-			CAdelayID = setTimeout("switchtimer.style.opacity = 0; ",ShowSetTimer);
-		}
-	}
-
 	showDisplay(Right(currChan.toString(),4), false, 100, 0 );
         
   } catch (e) {
@@ -665,6 +648,25 @@ if (zero<10)
 return zero;
 }
 
+function ExtraStuff(){
+	if(TimeShift){
+	    initialDelayID = setTimeout("startTimeshiftBuffering();", 5000);
+	}
+	if(testing2) {
+			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) ||
+			(currChan > 632 && currChan < 700) || (currChan > 8004 && currChan < 8027) )
+		{
+			//Show info if set nonfree
+			switchtimer.innerHTML = "<pre><center>\n" + Lang[90] +"\n\n </center></pre>"; // Non free channel message
+			switchtimer.style.opacity = 1;
+			CAdelayID = setTimeout("switchtimer.style.opacity = 0; ",ShowSetTimer);
+		}
+	}
+
+}
+
 function startTimeshiftBuffering() {
     // check that media player is working
     if (mediaPlayer.getState() != mediaPlayer.STATE_PLAYING ) {