--- a/qtmobility/plugins/multimedia/wmp/qwmpplayerservice.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpplayerservice.h	Wed Jun 23 19:08:38 2010 +0300
@@ -43,7 +43,6 @@
 #define QWMPPLAYERSERVICE_H
 
 #include "qwmpevents.h"
-#include "qwmpvideooutputcontrol.h"
 
 #include <qmediaservice.h>
 
@@ -51,6 +50,7 @@
 class QMediaMetaData;
 class QMediaPlayerControl;
 class QMediaPlaylist;
+class QVideoWindowControl;
 QT_END_NAMESPACE
 
 class QEvrVideoOverlay;
@@ -78,7 +78,8 @@
     QWmpPlayerService(EmbedMode mode, QObject *parent = 0);
     ~QWmpPlayerService();
 
-    QMediaControl *control(const char *name) const;
+    QMediaControl *requestControl(const char *name);
+    void releaseControl(QMediaControl *control);
 
     // IUnknown
     HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **object);
@@ -102,9 +103,6 @@
     HRESULT STDMETHODCALLTYPE GetScriptableObject(BSTR *pbstrName, IDispatch **ppDispatch);
     HRESULT STDMETHODCALLTYPE GetCustomUIMode(BSTR *pbstrFile);
 
-public Q_SLOTS:
-    void videoOutputChanged(QVideoOutputControl::Output output);
-
 private:
     volatile LONG m_ref;
     const EmbedMode m_embedMode;
@@ -114,7 +112,7 @@
     QWmpPlayerControl *m_control;
     QWmpMetaData *m_metaData;
     QWmpPlaylistControl *m_playlist;
-    QWmpVideoOutputControl *m_videoOutputControl;
+    QVideoWindowControl *m_activeVideoOverlay;
     QWmpVideoOverlay *m_oleVideoOverlay;
 #ifdef QWMP_EVR
     QEvrVideoOverlay *m_evrVideoOverlay;