summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-04-30 11:32:38 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-04-30 12:45:50 (GMT)
commit25ed3acf3daa1141e7ae5ac65f6456b9af9b451a (patch)
tree50acdc9892c07b1f19f05a9364d3b51b44f9b21d
parent2665a992c56b902d098818e192e11164d9bf4e01 (diff)
downloadQt-25ed3acf3daa1141e7ae5ac65f6456b9af9b451a.zip
Qt-25ed3acf3daa1141e7ae5ac65f6456b9af9b451a.tar.gz
Qt-25ed3acf3daa1141e7ae5ac65f6456b9af9b451a.tar.bz2
Fixed incorrect runtime platform version check in Phonon MMF backend
In S60 3.2, CMdaAudioPlayerUtility::SetVolume(TInt) was changed from having a void return type to returning TInt. The code in the Phonon MMF backend which calls this function uses a runtime platform version check to ensure that only on S60 3.2 and above is the return value from SetVolume treated as valid. This check was previously testing for the wrong platform version (5.0 rather than 3.2). Reviewed-by: Shane Kearns
-rw-r--r--src/3rdparty/phonon/mmf/audioplayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/audioplayer.cpp b/src/3rdparty/phonon/mmf/audioplayer.cpp
index 77a0964..f49e898 100644
--- a/src/3rdparty/phonon/mmf/audioplayer.cpp
+++ b/src/3rdparty/phonon/mmf/audioplayer.cpp
@@ -99,7 +99,7 @@ int MMF::AudioPlayer::setDeviceVolume(int mmfVolume)
* stack by doing a runtime check of the SDK version. */
#if !defined(__SERIES60_31__)
const int err = m_player->SetVolume(mmfVolume);
- if (QSysInfo::s60Version() >= QSysInfo::SV_S60_5_0)
+ if (QSysInfo::s60Version() >= QSysInfo::SV_S60_3_2)
return err;
else
return KErrNone;