diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-11-02 14:08:48 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-11-03 12:14:14 (GMT) |
| commit | 0c7190fa5b6fd5d401854f689676eee8d8591b75 (patch) | |
| tree | 676f47115785e76bbdfdfebe21ee8a41ecf070a0 /src/3rdparty/phonon/mmf | |
| parent | 0ae2258c6cf89349e795b6af95455e29d2a1fa70 (diff) | |
| download | Qt-0c7190fa5b6fd5d401854f689676eee8d8591b75.zip Qt-0c7190fa5b6fd5d401854f689676eee8d8591b75.tar.gz Qt-0c7190fa5b6fd5d401854f689676eee8d8591b75.tar.bz2 | |
Fixed state bug in Phonon MMF backend
This fixes a bug introduced by 58efa8aa, which meant that, when a new
clip was opened:
1. Playback did not start automatically
2. The current volume setting in the app UI was not applied to the
MMF client API
Task-number: QTBUG-4999
Reviewed-by: trustme
Diffstat (limited to 'src/3rdparty/phonon/mmf')
| -rw-r--r-- | src/3rdparty/phonon/mmf/abstractmediaplayer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp index 998e861..b8c6fb0 100644 --- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp +++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp @@ -373,12 +373,12 @@ void MMF::AbstractMediaPlayer::changeState(PrivateState newState) { TRACE_CONTEXT(AbstractMediaPlayer::changeState, EAudioInternal); - // TODO: add some invariants to check that the transition is valid - AbstractPlayer::changeState(newState); - const Phonon::State oldPhononState = phononState(privateState()); const Phonon::State newPhononState = phononState(newState); + // TODO: add some invariants to check that the transition is valid + AbstractPlayer::changeState(newState); + if (LoadingState == oldPhononState && StoppedState == newPhononState) { // Ensure initial volume is set on MMF API before starting playback doVolumeChanged(); |