From 396d731af30048e3b98be14a7b97e5ba682a86f8 Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Wed, 3 Feb 2010 10:56:50 +1000
Subject: Compile fix for DirectShowAudioEndpointControl.

QAudioEndpointControl isn't defined in QtMultimedia, so inherit directly
from QMediaControl instead.
---
 .../mediaplayer/directshowaudioendpointcontrol.cpp          |  4 ++--
 .../directshow/mediaplayer/directshowaudioendpointcontrol.h | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.cpp b/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.cpp
index 2826ba5..4bb7228 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.cpp
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 DirectShowAudioEndpointControl::DirectShowAudioEndpointControl(
         DirectShowPlayerService *service, QObject *parent)
-    : QAudioEndpointSelector(parent)
+    : QMediaControl(parent)
     , m_service(service)
     , m_bindContext(0)
     , m_deviceEnumerator(0)
@@ -130,7 +130,7 @@ void DirectShowAudioEndpointControl::updateEndpoints()
                     oleMalloc->Free(string);
 
                     moniker->AddRef();
-                    m_devices.insert(QString::fromWCharArray(string), moniker);
+                    m_devices.insert(deviceId, moniker);
 
                     if (m_defaultEndpoint.isEmpty()
                             || deviceId.endsWith(QLatin1String("Default DirectSound Device"))) {
diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.h
index 9ab188c..2faac13 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.h
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowaudioendpointcontrol.h
@@ -42,19 +42,17 @@
 #ifndef DIRECTSHOWAUDIOENDPOINTCONTROL_H
 #define DIRECTSHOWAUDIOENDPOINTCONTROL_H
 
-#include <QtMultimedia/qaudioendpointselector.h>
+#include <QtMultimedia/qmediacontrol.h>
 
 #include <dshow.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 class DirectShowPlayerService;
 
-
-class DirectShowAudioEndpointControl : public QAudioEndpointSelector
+class DirectShowAudioEndpointControl : public QMediaControl
 {
     Q_OBJECT
 public:
@@ -82,6 +80,13 @@ private:
     QString m_activeEndpoint;
 };
 
+#define QAudioEndpointSelector_iid "com.nokia.Qt.QAudioEndpointSelector/1.0"
+
+class Duck
+{
+    uint quack;
+};
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
-- 
cgit v0.12