--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.h	Wed Jun 23 19:08:38 2010 +0300
@@ -44,8 +44,6 @@
 
 #include <qmediaservice.h>
 
-#include "qgstreamervideooutputcontrol.h"
-
 #include <gst/gst.h>
 QT_BEGIN_NAMESPACE
 class QAudioEndpointSelector;
@@ -72,10 +70,8 @@
     QGstreamerCaptureService(const QString &service, QObject *parent = 0);
     virtual ~QGstreamerCaptureService();
 
-    QMediaControl *control(const char *name) const;
-
-private slots:
-    void videoOutputChanged(QVideoOutputControl::Output output);    
+    QMediaControl *requestControl(const char *name);
+    void releaseControl(QMediaControl *);
 
 private:
     void setAudioPreview(GstElement*);
@@ -87,12 +83,13 @@
     QAudioEndpointSelector *m_audioInputEndpointSelector;
     QVideoDeviceControl *m_videoInputDevice;
 
-    QGstreamerVideoOutputControl *m_videoOutput;
+    QMediaControl *m_videoOutput;
+
     QGstreamerVideoRenderer *m_videoRenderer;
     QGstreamerElementFactory *m_videoRendererFactory;
-    QGstreamerVideoOverlay *m_videoWindow;
+    QMediaControl *m_videoWindow;
     QGstreamerElementFactory *m_videoWindowFactory;
-    QGstreamerVideoWidgetControl *m_videoWidgetControl;
+    QMediaControl *m_videoWidgetControl;
     QGstreamerElementFactory *m_videoWidgetFactory;
 };