Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not play/pause files nedlessly.

Browse Source 
The Controller would always pause and resume playing, even if it found
out there was no position or volume to restore. Since pausing on http
streams appears to be broken, this is not a good idea. Just check if we
have something to restore, and leave the function if not.

Fixes #14326
This commit is contained in:
Adrien Destugues 2018-08-06 20:13:13 +02:00
parent c90a0ee947
commit 3f45e1e6ef
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/apps/mediaplayer/Controller.cpp
View File

@ -723,13 +723,20 @@ Controller::RestoreState()
if (item == NULL)
return;
int lastFrame = item->LastFrame();
float lastVolume = item->LastVolume();
// Don't Pause()/Play() if we have nothing to do.
if (lastFrame <= 0 && lastVolume < 0)
return;
Pause();
if (item->LastFrame() > 0) {
if (lastFrame > 0) {
bool resume = fResume == mpSettings::RESUME_ALWAYS;
if (fResume == mpSettings::RESUME_ASK) {
BString label;
int32 time = (int32)((float)item->LastFrame() * TimeDuration()
int32 time = (int32)((float)lastFrame * TimeDuration()
/ (1000000 * _FrameDuration()));
label.SetToFormat(B_TRANSLATE("Do you want to resume %s at %dm%ds?"),
item->Name().String(), time / 60, time % 60);
@ -739,10 +746,9 @@ Controller::RestoreState()
}
if (resume)
SetFramePosition(item->LastFrame());
SetFramePosition(lastFrame);
}
float lastVolume = item->LastVolume();
if (lastVolume >= 0)
SetVolume(lastVolume);