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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea1a4ad6f1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-30 14:41:19 +02:00
parent defb581a0d 5d38764dc8
commit 6ec4b9ca6d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/movieplayer.cpp
View File

@@ -1289,6 +1289,11 @@ bool CMoviePlayerGui::SetPosition(int pos, bool absolute)
{ {
clearSubtitle(); clearSubtitle();
bool res = playback->SetPosition(pos, absolute); 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; return res;
} }
@@ -1582,7 +1587,8 @@ void CMoviePlayerGui::PlayFileLoop(void)
makeScreenShot(); makeScreenShot();
} else if ((msg == (neutrino_msg_t) g_settings.mpkey_rewind) || } else if ((msg == (neutrino_msg_t) g_settings.mpkey_rewind) ||
(msg == (neutrino_msg_t) g_settings.mpkey_forward)) { (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) { if (msg == (neutrino_msg_t) g_settings.mpkey_rewind) {
newspeed = (speed >= 0) ? -1 : speed - 1; newspeed = (speed >= 0) ? -1 : speed - 1;
} else { } else {
@@ -1595,9 +1601,10 @@ void CMoviePlayerGui::PlayFileLoop(void)
if (playstate != CMoviePlayerGui::PAUSE) if (playstate != CMoviePlayerGui::PAUSE)
playstate = msg == (neutrino_msg_t) g_settings.mpkey_rewind ? CMoviePlayerGui::REW : CMoviePlayerGui::FF; playstate = msg == (neutrino_msg_t) g_settings.mpkey_rewind ? CMoviePlayerGui::REW : CMoviePlayerGui::FF;
updateLcd(); updateLcd();
setSpeed = true;
} }
if (!FileTimeOSD->IsVisible() && !time_forced) { if (!FileTimeOSD->IsVisible() && !time_forced && setSpeed) {
FileTimeOSD->switchMode(position, duration); FileTimeOSD->switchMode(position, duration);
time_forced = true; time_forced = true;
} }