mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/movieplayer.cpp: fix timeshift mode flags

Browse Source
This commit is contained in:
[CST] Focus
2014-09-25 15:42:57 +04:00
parent 540a060ba9
commit 34d642a631
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/record.h
View File

@@ -52,9 +52,9 @@
#define RECORD_MAX_COUNT 8 #define RECORD_MAX_COUNT 8
#define TSHIFT_MODE_OFF 0 #define TSHIFT_MODE_OFF 0
#define TSHIFT_MODE_TEMPORARY 1 #define TSHIFT_MODE_ON 1
#define TSHIFT_MODE_PERMANENT 2 #define TSHIFT_MODE_PAUSE 2
#define TSHIFT_MODE_PAUSE 3 #define TSHIFT_MODE_REWIND 3
//FIXME //FIXME
enum record_error_msg_t enum record_error_msg_t

14
src/gui/movieplayer.cpp
View File

@@ -242,13 +242,13 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
else if (actionKey == "fileplayback") { else if (actionKey == "fileplayback") {
} }
else if (actionKey == "timeshift") { else if (actionKey == "timeshift") {
timeshift = TSHIFT_MODE_TEMPORARY; timeshift = TSHIFT_MODE_ON;
} }
else if (actionKey == "ptimeshift") { else if (actionKey == "ptimeshift") {
timeshift = TSHIFT_MODE_PERMANENT; timeshift = TSHIFT_MODE_PAUSE;
} }
else if (actionKey == "rtimeshift") { else if (actionKey == "rtimeshift") {
timeshift = TSHIFT_MODE_PAUSE; timeshift = TSHIFT_MODE_REWIND;
} }
#if 0 // TODO ? #if 0 // TODO ?
else if (actionKey == "bookmarkplayback") { else if (actionKey == "bookmarkplayback") {
@@ -724,7 +724,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
if(timeshift != TSHIFT_MODE_OFF) { if(timeshift != TSHIFT_MODE_OFF) {
startposition = -1; startposition = -1;
int i; 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++) { for(i = 0; i < 500; i++) {
playback->GetPosition(position, duration); playback->GetPosition(position, duration);
startposition = (duration - position); startposition = (duration - position);
@@ -735,12 +735,12 @@ bool CMoviePlayerGui::PlayFileStart(void)
usleep(20000); usleep(20000);
} }
if (timeshift == TSHIFT_MODE_PAUSE) { if (timeshift == TSHIFT_MODE_REWIND) {
startposition = duration; startposition = duration;
} else { } else {
if (g_settings.timeshift_pause) if (g_settings.timeshift_pause)
playstate = CMoviePlayerGui::PAUSE; playstate = CMoviePlayerGui::PAUSE;
if (timeshift == TSHIFT_MODE_TEMPORARY) if (timeshift == TSHIFT_MODE_ON)
startposition = 0; startposition = 0;
else else
startposition = duration - TIMESHIFT_SECONDS*1000; startposition = duration - TIMESHIFT_SECONDS*1000;
@@ -751,7 +751,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
playback->SetPosition(startposition, true); playback->SetPosition(startposition, true);
/* playback->Start() starts paused */ /* playback->Start() starts paused */
if (timeshift == TSHIFT_MODE_PAUSE) { if (timeshift == TSHIFT_MODE_REWIND) {
speed = -1; speed = -1;
playback->SetSpeed(-1); playback->SetSpeed(-1);
playstate = CMoviePlayerGui::REW; playstate = CMoviePlayerGui::REW;