diff options
| -rw-r--r-- | History | 2 | ||||
| -rwxr-xr-x | channels_convert.sh | 4 | ||||
| -rw-r--r-- | index.html | 45 | ||||
| -rw-r--r-- | settings.js | 4 |
4 files changed, 21 insertions, 34 deletions
@@ -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 500 ms delay. + Some times after fast zapping you get an connection error. Next play after zap within 1,5 s has 300 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/channels_convert.sh b/channels_convert.sh index d899027..0d1e9f7 100755 --- a/channels_convert.sh +++ b/channels_convert.sh @@ -1,10 +1,10 @@ #! /bin/bash # # Script by rekordc@gmail.com -# 0.35 02/06/2014 +# 0.36 05/06/2014 # -svdrpsend.pl lstc -p 6419 > channels.list +svdrpsend.pl -p 6419 lstc > channels.list while IFS=: read Name Frequency Parameters Source SRate VPID APID TPID CA SID NID TID RID do @@ -447,40 +447,27 @@ try { function play(uri) { try { - if (initialDelayID != -1) { - clearTimeout(initialDelayID); - initialDelayID = -1; - } - if (mediaPlayer.getState() != mediaPlayer.STATE_IDLE) { - mediaPlayer.close(); - } - - if (isSchedule) { schedule.style.opacity = 0; isSchedule = 0;} - if (epgactive) { osdepginfo.style.opacity = 0; osdepginfonext.style.opacity = 0; epgactive = 0;} + if (initialDelayID != -1) { clearTimeout(initialDelayID); initialDelayID = -1; } + if (PlayDelayID != -1) { clearTimeout(PlayDelayID); PlayDelayID = -1; } + if (initialDelayPlayID != -1) { clearTimeout(initialDelayPlayID); initialDelayPlayID = -1; } - if (ServerAdres[ChanGroup] == "MultiCast" ) { - SI=channels[currChan].split("-"); - uri = SI[4]; - } else if (ServerAdres[ChanGroup] == "FullURL" ) { - // uri = ready! - } else { - uri = ServerAdres[ChanGroup] + uri; - } + if (mediaPlayer.getState() != mediaPlayer.STATE_IDLE) { mediaPlayer.close(); } + if (isSchedule) { schedule.style.opacity = 0; isSchedule = 0;} + if (epgactive) { osdepginfo.style.opacity = 0; osdepginfonext.style.opacity = 0; epgactive = 0;} - if (initialDelayPlayID != -1) { - clearTimeout(initialDelayPlayID); - initialDelayPlayID = -1; - } + if (ServerAdres[ChanGroup] == "MultiCast" ) { SI=channels[currChan].split("-"); uri = SI[4]; + } else if (ServerAdres[ChanGroup] == "FullURL" ) { // uri = ready! + } else { uri = ServerAdres[ChanGroup] + uri; } - URL = uri; - initialDelayPlayID = setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",initialDelayPlay); - SetLed(1,1,0); + URL = uri; + initialDelayPlayID = setTimeout("mediaPlayer.open(URL);mediaPlayer.play(1000);GetEPG(currChan);ExtraStuff();",initialDelayPlay); + initialDelayPlay = 300; // wait 300 ms before zap to next channel + PlayDelayID = setTimeout("initialDelayPlay = 0;",1500); + SetLed(1,1,0); - if(isFullscreen) { - showOSD(); - } + if(isFullscreen) { showOSD(); } - showDisplay(Right(currChan.toString(),4), false, 100, 0 ); + showDisplay(Right(currChan.toString(),4), false, 100, 0 ); } catch (e) { alert("Failed opening stream: " + e); diff --git a/settings.js b/settings.js index 8acabe6..89f7f03 100644 --- a/settings.js +++ b/settings.js @@ -348,5 +348,5 @@ var Chan_Ver = "Not set"; var Fav_key1; var set_yellow_key = 0; var URL; -var initialDelayPlay = 300; // wait 300 ms before zap to next channel; - +var initialDelayPlay = 0; +var PlayDelayID; |