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 branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-07-02 17:22:23 +02:00
parent 542626c0da 3213999198
commit f791ee1455
8 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/movieplayer.cpp
View File

@@ -1281,6 +1281,11 @@ bool CMoviePlayerGui::SetPosition(int pos, bool absolute)
{
clearSubtitle();
bool res = playback->SetPosition(pos, absolute);
if(is_file_player && res && speed == 0 && playstate == CMoviePlayerGui::PAUSE){
playstate = CMoviePlayerGui::PLAY;
speed = 1;
playback->SetSpeed(speed);
}
return res;
}
@@ -1566,7 +1571,8 @@ void CMoviePlayerGui::PlayFileLoop(void)
makeScreenShot();
} else if ((msg == (neutrino_msg_t) g_settings.mpkey_rewind) ||
(msg == (neutrino_msg_t) g_settings.mpkey_forward)) {
int newspeed;
int newspeed = 0;
bool setSpeed = false;
if (msg == (neutrino_msg_t) g_settings.mpkey_rewind) {
newspeed = (speed >= 0) ? -1 : speed - 1;
} else {
@@ -1579,9 +1585,10 @@ void CMoviePlayerGui::PlayFileLoop(void)
if (playstate != CMoviePlayerGui::PAUSE)
playstate = msg == (neutrino_msg_t) g_settings.mpkey_rewind ? CMoviePlayerGui::REW : CMoviePlayerGui::FF;
updateLcd();
setSpeed = true;
}
if (!FileTimeOSD->IsVisible() && !time_forced) {
if (!FileTimeOSD->IsVisible() && !time_forced && setSpeed) {
FileTimeOSD->switchMode(position, duration);
time_forced = true;
}