From 34d642a63105b752ff4c56cc44aeb3d51cd2b5f6 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 25 Sep 2014 15:42:57 +0400
Subject: [PATCH] gui/movieplayer.cpp: fix timeshift mode flags

---
 src/driver/record.h     |  6 +++---
 src/gui/movieplayer.cpp | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/driver/record.h b/src/driver/record.h
index 224241ae0..4d255936c 100644
--- a/src/driver/record.h
+++ b/src/driver/record.h
@@ -52,9 +52,9 @@
 #define RECORD_MAX_COUNT 8
 
 #define TSHIFT_MODE_OFF		0
-#define TSHIFT_MODE_TEMPORARY	1
-#define TSHIFT_MODE_PERMANENT	2
-#define TSHIFT_MODE_PAUSE	3
+#define TSHIFT_MODE_ON		1
+#define TSHIFT_MODE_PAUSE	2
+#define TSHIFT_MODE_REWIND	3
 
 //FIXME
 enum record_error_msg_t
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 5490e310c..81a09d33f 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -242,13 +242,13 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
 	else if (actionKey == "fileplayback") {
 	}
 	else if (actionKey == "timeshift") {
-		timeshift = TSHIFT_MODE_TEMPORARY;
+		timeshift = TSHIFT_MODE_ON;
 	}
 	else if (actionKey == "ptimeshift") {
-		timeshift = TSHIFT_MODE_PERMANENT;
+		timeshift = TSHIFT_MODE_PAUSE;
 	}
 	else if (actionKey == "rtimeshift") {
-		timeshift = TSHIFT_MODE_PAUSE;
+		timeshift = TSHIFT_MODE_REWIND;
 	}
 #if 0 // TODO ?
 	else if (actionKey == "bookmarkplayback") {
@@ -724,7 +724,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
 		if(timeshift != TSHIFT_MODE_OFF) {
 			startposition = -1;
 			int i;
-			int towait = (timeshift == 1) ? TIMESHIFT_SECONDS+1 : TIMESHIFT_SECONDS;
+			int towait = (timeshift == TSHIFT_MODE_ON) ? TIMESHIFT_SECONDS+1 : TIMESHIFT_SECONDS;
 			for(i = 0; i < 500; i++) {
 				playback->GetPosition(position, duration);
 				startposition = (duration - position);
@@ -735,12 +735,12 @@ bool CMoviePlayerGui::PlayFileStart(void)
 
 				usleep(20000);
 			}
-			if (timeshift == TSHIFT_MODE_PAUSE) {
+			if (timeshift == TSHIFT_MODE_REWIND) {
 				startposition = duration;
 			} else {
 				if (g_settings.timeshift_pause)
 					playstate = CMoviePlayerGui::PAUSE;
-				if (timeshift == TSHIFT_MODE_TEMPORARY)
+				if (timeshift == TSHIFT_MODE_ON)
 					startposition = 0;
 				else
 					startposition = duration - TIMESHIFT_SECONDS*1000;
@@ -751,7 +751,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
 			playback->SetPosition(startposition, true);
 
 		/* playback->Start() starts paused */
-		if (timeshift == TSHIFT_MODE_PAUSE) {
+		if (timeshift == TSHIFT_MODE_REWIND) {
 			speed = -1;
 			playback->SetSpeed(-1);
 			playstate = CMoviePlayerGui::REW;