i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MediaPlayer: Move winding code into its own function.

Browse Source
This commit is contained in:
Michael Lotz
2013-11-24 22:37:27 +01:00
parent dcc56bf748
commit 2937bbe3bc
2 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mediaplayer/MainWin.cpp
+30 -22
View File
@@ -844,9 +844,6 @@ MainWin::MessageReceived(BMessage* msg)
case M_WIND:
{
if (!fAllowWinding)
break;
bigtime_t howMuch;
int64 frames;
if (msg->FindInt64("how much", &howMuch) != B_OK
@@ -854,25 +851,7 @@ MainWin::MessageReceived(BMessage* msg)
break;
}
if (fController->Lock()) {
if (fHasVideo && !fController->IsPlaying()) {
int64 newFrame = fController->CurrentFrame() + frames;
fController->SetFramePosition(newFrame);
} else {
bigtime_t seekTime = fController->TimePosition() + howMuch;
if (seekTime < 0) {
fInitialSeekPosition = seekTime;
PostMessage(M_SKIP_PREV);
} else if (seekTime > fController->TimeDuration()) {
fInitialSeekPosition = 0;
PostMessage(M_SKIP_NEXT);
} else
fController->SetTimePosition(seekTime);
}
fController->Unlock();
fAllowWinding = false;
}
_Wind(howMuch, frames);
break;
}
@@ -2400,6 +2379,35 @@ MainWin::_ShowFullscreenControls(bool show, bool animate)
// #pragma mark -
void
MainWin::_Wind(bigtime_t howMuch, int64 frames)
{
if (!fAllowWinding || !fController->Lock())
return;
if (frames != 0 && fHasVideo && !fController->IsPlaying()) {
int64 newFrame = fController->CurrentFrame() + frames;
fController->SetFramePosition(newFrame);
} else {
bigtime_t seekTime = fController->TimePosition() + howMuch;
if (seekTime < 0) {
fInitialSeekPosition = seekTime;
PostMessage(M_SKIP_PREV);
} else if (seekTime > fController->TimeDuration()) {
fInitialSeekPosition = 0;
PostMessage(M_SKIP_NEXT);
} else
fController->SetTimePosition(seekTime);
}
fController->Unlock();
fAllowWinding = false;
}
// #pragma mark -
void
MainWin::_UpdatePlaylistItemFile()
{