diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-10-21 04:32:32 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-10-21 04:32:32 (GMT) |
| commit | da433db6b88cc82b9897a95ce790a02bea14d900 (patch) | |
| tree | 4ca554455bec2a9c3be88a4b3535ef3bd9c114f0 /src/3rdparty | |
| parent | 0cb251e67ae45d8ab5ad715a4bc6dcf89209d2ab (diff) | |
| parent | 7997279bc22d30bf1d1a30a567bda33ecc9aeb2d (diff) | |
| download | Qt-da433db6b88cc82b9897a95ce790a02bea14d900.zip Qt-da433db6b88cc82b9897a95ce790a02bea14d900.tar.gz Qt-da433db6b88cc82b9897a95ce790a02bea14d900.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/mmf/audiooutput.cpp | 8 | ||||
| -rw-r--r-- | src/3rdparty/phonon/mmf/mmf_videoplayer.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/phonon/mmf/audiooutput.cpp b/src/3rdparty/phonon/mmf/audiooutput.cpp index 5a00f60..82af9f1 100644 --- a/src/3rdparty/phonon/mmf/audiooutput.cpp +++ b/src/3rdparty/phonon/mmf/audiooutput.cpp @@ -102,15 +102,15 @@ bool MMF::AudioOutput::activateOnMediaObject(MediaObject *mo) QHash<QByteArray, QVariant> MMF::AudioOutput::audioOutputDescription(int index) { - if (index == AudioOutputDeviceID) { - QHash<QByteArray, QVariant> retval; + QHash<QByteArray, QVariant> retval; + if (index == AudioOutputDeviceID) { retval.insert("name", QCoreApplication::translate("Phonon::MMF", "Audio Output")); retval.insert("description", QCoreApplication::translate("Phonon::MMF", "The audio output device")); retval.insert("available", true); - - return retval; } + + return retval; } QT_END_NAMESPACE diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp index a93aca0..d1d2337 100644 --- a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp +++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp @@ -300,8 +300,8 @@ void MMF::VideoPlayer::MvpuoPlayComplete(TInt aError) TRACE_CONTEXT(VideoPlayer::MvpuoPlayComplete, EVideoApi) TRACE_ENTRY("state %d error %d", state(), aError); - // TODO Q_UNUSED(aError); // suppress warnings in release builds + changeState(StoppedState); TRACE_EXIT_0(); } |