slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WMF: don't resume playback after doing a seek while paused.

Browse Source 
Task-number: QTBUG-32746
Change-Id: I5a9ee96324e0ddc65311f47dc887bcb91b036fd2
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
This commit is contained in:
Andy Shaw
2015-03-25 23:33:13 +01:00
parent 92ea7cb89b
commit 90fe52d086
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/wmf/player/mfplayersession.cpp
View File

@@ -1721,10 +1721,17 @@ void MFPlayerSession::updatePendingCommands(Command command)
if (m_state.command != command || m_pendingState == NoPending) if (m_state.command != command || m_pendingState == NoPending)
return; return;
// The current pending command has completed. // Seek while paused completed
if (m_pendingState == SeekPending && m_state.prevCmd == CmdPause) { if (m_pendingState == SeekPending && m_state.prevCmd == CmdPause) {
m_pendingState = NoPending; m_pendingState = NoPending;
m_state.setCommand(CmdPause); // A seek operation actually restarts playback. If scrubbing is possible, playback rate
// is set to 0.0 at this point and we just need to reset the current state to Pause.
// If scrubbing is not possible, the playback rate was not changed and we explicitly need
// to re-pause playback.
if (!canScrub())
pause();
else
m_state.setCommand(CmdPause);
} }
m_pendingState = NoPending; m_pendingState = NoPending;