Merge branch 'mmfphonon' into 4.6

2 files changed, 5 insertions, 3 deletions

diff --git a/src/3rdparty/phonon/mmf/audiooutput.cpp b/src/3rdparty/phonon/mmf/audiooutput.cpp
index 5a00f60..bb0e5bc 100644
--- a/src/3rdparty/phonon/mmf/audiooutput.cpp
+++ b/src/3rdparty/phonon/mmf/audiooutput.cpp
@@ -102,15 +102,17 @@ bool MMF::AudioOutput::activateOnMediaObject(MediaObject *mo)
 
 QHash<QByteArray, QVariant> MMF::AudioOutput::audioOutputDescription(int index)
 {
+    QHash<QByteArray, QVariant> retval;
+
     if (index == AudioOutputDeviceID) {
         QHash<QByteArray, QVariant> retval;
 
         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();
 }