summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--History4
-rwxr-xr-xchannels_convert.sh4
-rw-r--r--index.html32
-rw-r--r--settings.js3
4 files changed, 38 insertions, 5 deletions
diff --git a/History b/History
index 7abbaa8..f566837 100644
--- a/History
+++ b/History
@@ -22,6 +22,10 @@ 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.
+ 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)
+
0.23 Infobox for connection Error, not only ERRR on display but also the Infobox
diff --git a/channels_convert.sh b/channels_convert.sh
index 28a413f..d899027 100755
--- a/channels_convert.sh
+++ b/channels_convert.sh
@@ -1,10 +1,10 @@
#! /bin/bash
#
# Script by rekordc@gmail.com
-# 0.34 17/05/2014
+# 0.35 02/06/2014
#
-svdrpsend.pl lstc > channels.list
+svdrpsend.pl lstc -p 6419 > channels.list
while IFS=: read Name Frequency Parameters Source SRate VPID APID TPID CA SID NID TID RID
do
diff --git a/index.html b/index.html
index 68ebf15..0a294f5 100644
--- a/index.html
+++ b/index.html
@@ -466,8 +466,15 @@ function play(uri) {
} else {
uri = ServerAdres[ChanGroup] + uri;
}
+
mediaPlayer.open(uri);
- mediaPlayer.play(1000);
+
+ if (initialDelayPlayID != -1) {
+ clearTimeout(initialDelayPlayID);
+ initialDelayPlayID = -1;
+ }
+
+ initialDelayPlayID = setTimeout("mediaPlayer.play(1000);GetEPG(currChan);",500);
SetLed(1,1,0);
if(TimeShift){
@@ -492,7 +499,7 @@ function play(uri) {
}
showDisplay(Right(currChan.toString(),4), false, 100, 0 );
- GetEPG(currChan);
+
} catch (e) {
alert("Failed opening stream: " + e);
alert("error: " + mediaPlayer.getTimeshiftError().source);
@@ -3447,6 +3454,15 @@ if (DelisOK) {
showMediaList();
}
break;
+ case KEY_1:
+ if (getRecOK == 1 && (recGroup[currMed] == 0 || subgroup == 1)) {
+ // Only do reccmds if it isn't a subdir marker
+ reccmds(1);
+ // my reccmds.conf has on position 1 a move script so I add move file icon to medialist entry
+ recList[currMed] = "\uE005" + recList[currMed].substring(1);
+ showMediaList();
+ }
+ break;
default:
break;
@@ -3863,6 +3879,18 @@ try {
}
+function reccmds(option) {
+try {
+ var xmlhttp = new XMLHttpRequest();
+ xmlhttp.open("POST", server_ip + recServ + "/execreccmd?cmd=" + option + "&guid=" + recGUID[currMed], false);
+ xmlhttp.send();
+ } catch(e) {
+ alert("Execute reccmds problem: " + e);
+ }
+
+}
+
+
function getVDRstatus() {
try {
diff --git a/settings.js b/settings.js
index a6f69c0..969309e 100644
--- a/settings.js
+++ b/settings.js
@@ -2,7 +2,7 @@
// Default settings
//
-var Version = "0.24.18";
+var Version = "0.24.19";
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");
@@ -243,6 +243,7 @@ var CAdelayID = 0;
var ProtectID = 0;
var SleepTimer = 0;
var SleepTimerID = -1;
+var initialDelayPlayID = -1;
var instanttimer = new Array();
var inst_timer = 0;