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

Merge remote-tracking branch 'tuxbox/master'

Browse Source
This commit is contained in:
Stefan Seyfried
2017-02-11 11:18:45 +01:00
parent 0f4e6298c8 582051b9a1
commit 8b47699447
32 changed files with 217 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/movieplayer.cpp
View File

@@ -311,6 +311,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
FileTimeOSD->kill();
FileTimeOSD->setMode(CTimeOSD::MODE_HIDE);
FileTimeOSD->setMpTimeForced(false);
time_forced = false;
if (actionKey == "tsmoviebrowser") {
@@ -1129,6 +1130,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
{
menu_ret = menu_return::RETURN_REPAINT;
FileTimeOSD->setMpTimeForced(false);
time_forced = false;
position = 0, duration = 0;
@@ -1230,6 +1232,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
FileTimeOSD->switchMode(position, duration);
time_forced = true;
}
FileTimeOSD->setMpTimeForced(true);
} else if (timeshift == TSHIFT_MODE_OFF || !g_settings.timeshift_pause) {
playback->SetSpeed(1);
}
@@ -1435,6 +1438,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
time_forced = false;
FileTimeOSD->kill();
}
FileTimeOSD->setMpTimeForced(false);
if (playstate > CMoviePlayerGui::PLAY) {
playstate = CMoviePlayerGui::PLAY;
speed = 1;
@@ -1469,6 +1473,11 @@ void CMoviePlayerGui::PlayFileLoop(void)
enableOsdElements(MUTE);
}
} else if (msg == (neutrino_msg_t) g_settings.mpkey_pause) {
if (time_forced) {
time_forced = false;
FileTimeOSD->kill();
}
FileTimeOSD->setMpTimeForced(false);
if (playstate == CMoviePlayerGui::PAUSE) {
playstate = CMoviePlayerGui::PLAY;
//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, false);
@@ -1500,6 +1509,8 @@ void CMoviePlayerGui::PlayFileLoop(void)
update_lcd = true;
} else if (msg == (neutrino_msg_t) g_settings.mpkey_time) {
FileTimeOSD->switchMode(position, duration);
time_forced = false;
FileTimeOSD->setMpTimeForced(false);
} else if (msg == (neutrino_msg_t) g_settings.mbkey_cover) {
makeScreenShot(false, true);
} else if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
@@ -1525,6 +1536,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
FileTimeOSD->switchMode(position, duration);
time_forced = true;
}
FileTimeOSD->setMpTimeForced(true);
if (timeshift == TSHIFT_MODE_OFF)
callInfoViewer();
} else if (msg == CRCInput::RC_1) { // Jump Backwards 1 minute