summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-04-14 19:04:39 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-04-15 05:40:11 (GMT)
commit92ed8a1a049f60733ce15c4a5b79ed0fc389cfcd (patch)
tree681f006945d07a6cbaa764785abe924fb6321b9f /src/3rdparty/phonon
parent0c2f5376e921fa9badd87a3eb37d94868451248c (diff)
downloadQt-92ed8a1a049f60733ce15c4a5b79ed0fc389cfcd.zip
Qt-92ed8a1a049f60733ce15c4a5b79ed0fc389cfcd.tar.gz
Qt-92ed8a1a049f60733ce15c4a5b79ed0fc389cfcd.tar.bz2
Phonon MMF: ensure initial volume is applied
A recent change meant that, if the user set a volume level before loading a clip into the MediaObject, that initial volume level was not applied to the audio output. Reviewed-by: Frans Englich
Diffstat (limited to 'src/3rdparty/phonon')
-rw-r--r--src/3rdparty/phonon/mmf/abstractmediaplayer.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
index 7104ebd..be2a568 100644
--- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
+++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
@@ -494,15 +494,14 @@ void MMF::AbstractMediaPlayer::changeState(PrivateState newState)
const Phonon::State newPhononState = phononState(newState);
if (LoadingState == oldPhononState && StoppedState == newPhononState) {
- // Ensure initial volume is set on MMF API before starting playback
- doVolumeChanged();
-
switch (m_pending) {
case NothingPending:
AbstractPlayer::changeState(newState);
break;
case PlayPending:
+ changeState(PlayingState); // necessary in order to apply initial volume
+ doVolumeChanged();
startPlayback();
break;