From 69fb5a5f82418af920e6f0e71fc120d1af7023a3 Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Thu, 26 Mar 2015 18:50:03 +0100 Subject: try restart after stream errors --- History | 3 +++ javascript/main.js | 19 ++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/History b/History index 40f9cd6..3ca3e92 100644 --- a/History +++ b/History @@ -16,6 +16,9 @@ VDR 1.7.29+ News info from nu.nl (nl), dw.de (en/de), spiegel.de (en/de) News can be scrolled with up/down, left/right for server selection Powerserverdown shares now blue button with restart script (almost nobody uses powerserverdown) + After stream state paused & positionend, script waits TryingInterval time and tries to restart stream + (if server is stopped/restarted you get this error) + 0.26 Fix for [undefined] in (search)timer menu when there are no (search)timers on server diff --git a/javascript/main.js b/javascript/main.js index 95d4793..85023e5 100644 --- a/javascript/main.js +++ b/javascript/main.js @@ -3500,6 +3500,15 @@ function ShowSearchTimerInfo() { // MPD Section function MPD(ev) { +// ev.state : +// STATE_IDLE = 0 +// STATE_CONNECTING = 1 +// STATE_PAUSED = 2 +// STATE_PLAYING = 3 +// STATE_FASTFORWARDING = 4 +// STATE_REWINDING = 5 +// STATE_FAILED = 6 + // alert("Media player state changed: " + ev); // alert("Media player state changed: state=" + ev.state + ", reason=" + ev.reason + ", code=" + ev.code); // alert("Media player error :" + mediaPlayer.getError().details); @@ -3514,7 +3523,6 @@ if (MPDListener == 0) { initialDelayPlayID = setTimeout("mediaPlayer.close();mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",TryingInterval); } 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,color_error); @@ -3522,8 +3530,13 @@ if (MPDListener == 0) { settimer(0,Lang[67],0,2,color_error); } } - } else if ( ev.state == 2 && ev.reason == "PositionEnd" && PromoChannel) { - if (currChan == PromoChannelNR) { play(channels[PromoChannelNR]);} + } else if ( ev.state == 2 && ev.reason == "PositionEnd") { + if (PromoChannel && currChan == PromoChannelNR) { + play(channels[PromoChannelNR]); + } else { + settimer(0,Lang[63],0,2,color_error); + initialDelayPlayID = setTimeout("mediaPlayer.close();mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",TryingInterval); + } } } else { if ( ev.state == 6 && ev.reason == "HostUnreachable" ) { -- cgit v1.2.3