summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--History1
-rw-r--r--javascript/main.js8
-rw-r--r--javascript/settings.js2
3 files changed, 8 insertions, 3 deletions
diff --git a/History b/History
index 9a7f800..831b6bf 100644
--- a/History
+++ b/History
@@ -12,6 +12,7 @@ VDR 1.7.29+
Fixed error getting german languages file.
Get server ip from flash
Bugfix, removed delayed play (in case of error) when you already start to play a recording
+ Save old position before jump forward. In case of ongoing recording and jump position isn't recorded yet you don't start replay at 0
0.26 Fix for [undefined] in (search)timer menu when there are no (search)timers on server
Changed Plugin check, only check if digit 1,2,3 from server ip & box ip are the same.
diff --git a/javascript/main.js b/javascript/main.js
index 6ba9277..e9a16a6 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -3989,6 +3989,7 @@ if (DelisOK) {
break;
case KEY_3:
if (localRecording != 1 ) {
+ setResume();
position += (mediaPlayer.getPosition()/1000) + 30;
if (get_recordings == 1) {
if (position >= recDura[currMed]) {
@@ -4005,6 +4006,7 @@ if (DelisOK) {
break;
case KEY_6:
if (localRecording != 1 ) {
+ setResume();
position += (mediaPlayer.getPosition()/1000) + 60;
if (get_recordings == 1) {
if (position >= recDura[currMed]) {
@@ -4021,6 +4023,7 @@ if (DelisOK) {
break;
case KEY_9:
if (localRecording != 1 ) {
+ setResume();
position += (mediaPlayer.getPosition()/1000) + 240;
if (get_recordings == 1) {
if (position >= recDura[currMed]) {
@@ -4038,6 +4041,7 @@ if (DelisOK) {
case KEY_0:
if (localRecording != 1 ) {
position = 0; posMark = 0;
+ setResumeNull();
if (get_recordings == 1) {
playRec((recLink[currMed] + "?mode=streamtoend&time=" + position));
} else if (get_recordings == 2) {
@@ -4283,9 +4287,9 @@ if (get_marks==1) {
function setResume() {
if (get_recordings == 1) {
try {
- position += (mediaPlayer.getPosition()/1000)
+// position += (mediaPlayer.getPosition()/1000)
var xmlhttp = new XMLHttpRequest();
- xmlhttp.open("POST", server_ip + recServ + "/setResume.xml?guid=" + recGUID[currMed] + "&resume=" + position, false);
+ xmlhttp.open("POST", server_ip + recServ + "/setResume.xml?guid=" + recGUID[currMed] + "&resume=" + (position + (mediaPlayer.getPosition()/1000)), false);
xmlhttp.send();
recList[currMed] = "\uE003" + recList[currMed].substring(1);
} catch(e) {
diff --git a/javascript/settings.js b/javascript/settings.js
index e31f683..c439d27 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -2,7 +2,7 @@
// Default settings
//
-var Version = "0.27.3";
+var Version = "0.27.4";
//weather
var city = "Almelo";