From 9cbb12f7be000d481c4ef22d995cdae606384086 Mon Sep 17 00:00:00 2001
From: "M. Voerman" <rekordc@gmail.com>
Date: Tue, 17 Feb 2015 18:51:59 +0100
Subject: Set resume before jump forward. If eof (file is still recording) play
 isn't restarting at 0

---
 javascript/main.js     | 8 ++++++--
 javascript/settings.js | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'javascript')

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";
-- 
cgit v1.2.3