mediaplayer: crash in settings dialog.

The MediaPlayer requires that an output device is available.

Task-number: QTBUG-4755
Reviewed-by: Gareth Stockwell

1 files changed, 9 insertions, 4 deletions

diff --git a/src/3rdparty/phonon/mmf/audiooutput.h b/src/3rdparty/phonon/mmf/audiooutput.h
index 0a962a9..d0ba086 100644
--- a/src/3rdparty/phonon/mmf/audiooutput.h
+++ b/src/3rdparty/phonon/mmf/audiooutput.h
@@ -19,6 +19,8 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef PHONON_MMF_AUDIOOUTPUT_H
 #define PHONON_MMF_AUDIOOUTPUT_H
 
+#include <QHash>
+
 #include "mmf_medianode.h"
 #include <phonon/audiooutputinterface.h>
 
@@ -65,10 +67,12 @@ public:
      */
     virtual bool setOutputDevice(int);
 
-    /**
-     * Has no effect.
-     */
-    virtual bool setOutputDevice(const Phonon::AudioOutputDevice &);
+    static QHash<QByteArray, QVariant> audioOutputDescription(int index);
+
+    enum Constants
+    {
+        AudioOutputDeviceID = 0
+    };
 
 protected:
     virtual bool activateOnMediaObject(MediaObject *mo);
@@ -78,6 +82,7 @@ Q_SIGNALS:
     void audioDeviceFailed();
 
 private:
+
     void setVolumeObserver(VolumeObserver* observer);
 
     qreal                           m_volume;