mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 18:01:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/movieplayer.cpp: fix timeshift mode flags

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 34d642a631
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-09-25 15:42:57 +04:00
parent c3a494579d
commit db24abaa42
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 == "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;