diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-09-16 17:30:27 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@digia.com> | 2014-09-24 14:46:38 +0200 |
| commit | c1c205b772c2ca0adb7b00fe02d27a59429dd068 (patch) | |
| tree | 0cf329a01be136f25fc8cb773ad8d2606c918d06 /src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h | |
| parent | 49dc6dc45956daa2b30ea3c56a5e5dfaac8ad9a1 (diff) | |
Android: fix QMediaPlayer's state and mediaStatus signals.
Emit signals only after both properties are written to avoid having
incoherent values in signal handlers.
Task-number: QTBUG-40314
Change-Id: I6c8445e61cccf1a9803647329c4fa1f0e452f56d
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h')
| -rw-r--r-- | src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h index ec4dd3280..7de0c2dcf 100644 --- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h +++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h @@ -112,6 +112,7 @@ private: int mPendingVolume; int mPendingMute; QScopedPointer<QTemporaryFile> mTempFile; + int mActiveStateChangeNotifiers; void setState(QMediaPlayer::State state); void setMediaStatus(QMediaPlayer::MediaStatus status); @@ -122,6 +123,8 @@ private: void resetBufferingProgress(); void flushPendingStates(); void updateBufferStatus(); + + friend class StateChangeNotifier; }; QT_END_NAMESPACE |