mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 17:31:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/movieplayer.cpp: re-enable and fix auto-time display for REW, FF-modes

Browse Source
This commit is contained in:
[CST] Focus
2014-01-08 16:34:25 +04:00
parent 468a8df8f4
commit 911e41627c
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/movieplayer.cpp
View File

@@ -637,6 +637,10 @@ void CMoviePlayerGui::PlayFile(void)
} else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) { } else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) {
playstate = CMoviePlayerGui::STOPPED; playstate = CMoviePlayerGui::STOPPED;
} else if (msg == (neutrino_msg_t) g_settings.mpkey_play) { } else if (msg == (neutrino_msg_t) g_settings.mpkey_play) {
if (time_forced) {
time_forced = false;
FileTime.kill();
}
if (playstate > CMoviePlayerGui::PLAY) { if (playstate > CMoviePlayerGui::PLAY) {
playstate = CMoviePlayerGui::PLAY; playstate = CMoviePlayerGui::PLAY;
speed = 1; speed = 1;
@@ -646,10 +650,6 @@ void CMoviePlayerGui::PlayFile(void)
if (!timeshift) if (!timeshift)
callInfoViewer(/*duration, position*/); callInfoViewer(/*duration, position*/);
} }
if (time_forced) {
time_forced = false;
FileTime.kill();
}
} else if (msg == (neutrino_msg_t) g_settings.mpkey_pause) { } else if (msg == (neutrino_msg_t) g_settings.mpkey_pause) {
if (playstate == CMoviePlayerGui::PAUSE) { if (playstate == CMoviePlayerGui::PAUSE) {
playstate = CMoviePlayerGui::PLAY; playstate = CMoviePlayerGui::PLAY;
@@ -703,14 +703,12 @@ void CMoviePlayerGui::PlayFile(void)
} }
//update_lcd = true; //update_lcd = true;
if (!timeshift) if (!FileTime.IsVisible() && !time_forced) {
callInfoViewer(/*duration, position*/); FileTime.switchMode(position, duration);
#if 0 //FIXME, time display in combination with REW and FF is broken
if (!FileTime.IsVisible()) {
FileTime.show(position);
time_forced = true; time_forced = true;
} }
#endif if (!timeshift)
callInfoViewer(/*duration, position*/);
} else if (msg == CRCInput::RC_1) { // Jump Backwards 1 minute } else if (msg == CRCInput::RC_1) { // Jump Backwards 1 minute
clearSubtitle(); clearSubtitle();
playback->SetPosition(-60 * 1000); playback->SetPosition(-60 * 1000);