Some cleanup in the GStreamer plugin.

Removed QGstreamerVideoOverlay and related classes. It was used as
'Window' control but performs worse than QGstreamerVideoWindow which
does basically the same thing using GStreamer ready-made components
instead.
Removed X11 dependencies and related configuration tests. It was only
needed for QGstreamerVideoOverlay.

Change-Id: I2ad2636ccf0060e56cd64f3d9e5b3c24dc75f5a3
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

2 files changed, 9 insertions, 11 deletions

diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
index 9b2ec1c58..854da46df 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
@@ -53,11 +53,9 @@
 #include "qgstreameravailabilitycontrol.h"
 
 #if defined(HAVE_WIDGETS)
-#include <private/qgstreamervideooverlay_p.h>
-#include <private/qgstreamervideowindow_p.h>
 #include <private/qgstreamervideowidget_p.h>
 #endif
-
+#include <private/qgstreamervideowindow_p.h>
 #include <private/qgstreamervideorenderer_p.h>
 
 #if defined(Q_WS_MAEMO_6) && defined(__arm__)
@@ -78,8 +76,8 @@ QGstreamerPlayerService::QGstreamerPlayerService(QObject *parent):
      QMediaService(parent)
      , m_videoOutput(0)
      , m_videoRenderer(0)
-#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS)
      , m_videoWindow(0)
+#if defined(HAVE_WIDGETS)
      , m_videoWidget(0)
 #endif
      , m_videoReferenceCount(0)
@@ -96,12 +94,13 @@ QGstreamerPlayerService::QGstreamerPlayerService(QObject *parent):
     m_videoRenderer = new QGstreamerVideoRenderer(this);
 #endif
 
-#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS)
 #ifdef Q_WS_MAEMO_6
     m_videoWindow = new QGstreamerVideoWindow(this, "omapxvsink");
 #else
-    m_videoWindow = new QGstreamerVideoOverlay(this);
+    m_videoWindow = new QGstreamerVideoWindow(this);
 #endif
+
+#if defined(HAVE_WIDGETS)
     m_videoWidget = new QGstreamerVideoWidgetControl(this);
 #endif
 }
@@ -146,11 +145,11 @@ QMediaControl *QGstreamerPlayerService::requestControl(const char *name)
     if (!m_videoOutput) {
         if (qstrcmp(name, QVideoRendererControl_iid) == 0)
             m_videoOutput = m_videoRenderer;
-#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS)
+        else if (qstrcmp(name, QVideoWindowControl_iid) == 0)
+            m_videoOutput = m_videoWindow;
+#if defined(HAVE_WIDGETS)
         else if (qstrcmp(name, QVideoWidgetControl_iid) == 0)
             m_videoOutput = m_videoWidget;
-        else  if (qstrcmp(name, QVideoWindowControl_iid) == 0)
-            m_videoOutput = m_videoWindow;
 #endif
 
         if (m_videoOutput) {
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h
index 5b78c7904..691f72c75 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h
@@ -58,7 +58,6 @@ class QGstreamerPlayerSession;
 class QGstreamerMetaDataProvider;
 class QGstreamerStreamsControl;
 class QGstreamerVideoRenderer;
-class QGstreamerVideoOverlay;
 class QGstreamerVideoWidgetControl;
 class QGStreamerAvailabilityControl;
 
@@ -81,8 +80,8 @@ private:
 
     QMediaControl *m_videoOutput;
     QMediaControl *m_videoRenderer;
-#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS)
     QMediaControl *m_videoWindow;
+#if defined(HAVE_WIDGETS)
     QMediaControl *m_videoWidget;
 #endif