diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2014-03-24 19:56:26 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-07 15:02:57 +0200 |
| commit | b770fefa819dabb7f53f4ed5fe544f3b68b6279c (patch) | |
| tree | 7a2ae090881754a84971e14474e95b7b1296ac7c | |
| parent | aa3b5edb6dd0442af6afe90ccc93e34eed503d2f (diff) | |
| download | qtmultimedia-b770fefa819dabb7f53f4ed5fe544f3b68b6279c.tar.gz | |
QNX: Fix MediaPlayer states handling
Task-number: QTBUG-37753
Change-Id: I61ff490f061dedd8a9bdc22d76969d9afb9a6795
Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| -rw-r--r-- | src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp index 004eca36d..2555b2876 100644 --- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp +++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp @@ -351,10 +351,11 @@ void MmRendererMediaPlayerControl::setState(QMediaPlayer::State state) { if (m_state != state) { if (m_videoRendererControl) { - if (state == QMediaPlayer::PausedState) + if (state == QMediaPlayer::PausedState || state == QMediaPlayer::StoppedState) { m_videoRendererControl->pause(); - else if ((state == QMediaPlayer::PlayingState) - && (m_state == QMediaPlayer::PausedState)) { + } else if ((state == QMediaPlayer::PlayingState) + && (m_state == QMediaPlayer::PausedState + || m_state == QMediaPlayer::StoppedState)) { m_videoRendererControl->resume(); } } |