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

Merge remote-tracking branch 'check/next-cc'

Browse Source
This commit is contained in:
Stefan Seyfried
2014-01-12 14:41:44 +01:00
parent 1a37ab57a2 72cb72695f
commit a92141d147
29 changed files with 620 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/movieplayer.cpp
View File

@@ -664,6 +664,10 @@ void CMoviePlayerGui::PlayFile(void)
} else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) {
playstate = CMoviePlayerGui::STOPPED;
} else if (msg == (neutrino_msg_t) g_settings.mpkey_play) {
if (time_forced) {
time_forced = false;
FileTime.kill();
}
if (playstate > CMoviePlayerGui::PLAY) {
playstate = CMoviePlayerGui::PLAY;
speed = 1;
@@ -673,10 +677,6 @@ void CMoviePlayerGui::PlayFile(void)
if (!timeshift)
callInfoViewer(/*duration, position*/);
}
if (time_forced) {
time_forced = false;
FileTime.hide();
}
} else if (msg == (neutrino_msg_t) g_settings.mpkey_pause) {
if (playstate == CMoviePlayerGui::PAUSE) {
playstate = CMoviePlayerGui::PLAY;
@@ -730,13 +730,12 @@ void CMoviePlayerGui::PlayFile(void)
}
//update_lcd = true;
if (!timeshift)
callInfoViewer(/*duration, position*/);
if (!FileTime.IsVisible()) {
FileTime.show(position);
if (!FileTime.IsVisible() && !time_forced) {
FileTime.switchMode(position, duration);
time_forced = true;
}
if (!timeshift)
callInfoViewer(/*duration, position*/);
} else if (msg == CRCInput::RC_1) { // Jump Backwards 1 minute
clearSubtitle();
playback->SetPosition(-60 * 1000);
@@ -779,7 +778,7 @@ void CMoviePlayerGui::PlayFile(void)
//showHelpTS();
} else if(timeshift && (msg == CRCInput::RC_text || msg == CRCInput::RC_epg || msg == NeutrinoMessages::SHOW_EPG)) {
bool restore = FileTime.IsVisible();
FileTime.hide();
FileTime.kill();
if( msg == CRCInput::RC_epg )
g_EventList->exec(CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID(), CNeutrinoApp::getInstance()->channelList->getActiveChannelName());
@@ -862,7 +861,7 @@ void CMoviePlayerGui::PlayFile(void)
}
}
FileTime.hide();
FileTime.kill();
clearSubtitle();
playback->SetSpeed(1);