--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h	Wed Jun 23 19:08:38 2010 +0300
@@ -47,8 +47,6 @@
 
 #include <qmediaservice.h>
 
-#include "qgstreamervideooutputcontrol.h"
-
 QT_BEGIN_NAMESPACE
 class QMediaMetaData;
 class QMediaPlayerControl;
@@ -74,23 +72,19 @@
     QGstreamerPlayerService(QObject *parent = 0);
     ~QGstreamerPlayerService();
 
-    //void setVideoOutput(QObject *output);
-
-    QMediaControl *control(const char *name) const;
-
-private slots:
-    void videoOutputChanged(QVideoOutputControl::Output output);
+    QMediaControl *requestControl(const char *name);
+    void releaseControl(QMediaControl *control);
 
 private:
     QGstreamerPlayerControl *m_control;
     QGstreamerPlayerSession *m_session;
     QGstreamerMetaDataProvider *m_metaData;
-    QGstreamerVideoOutputControl *m_videoOutput;
     QGstreamerStreamsControl *m_streamsControl;
 
-    QGstreamerVideoRenderer *m_videoRenderer;
-    QGstreamerVideoOverlay *m_videoWindow;
-    QGstreamerVideoWidgetControl *m_videoWidget;
+    QMediaControl *m_videoOutput;
+    QMediaControl *m_videoRenderer;
+    QMediaControl *m_videoWindow;
+    QMediaControl *m_videoWidget;
 };
 
 #endif