Smaller cleanups

Change-Id: I298a4e6c41b0a6f130eec1e23863d62fd0986b85
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

12 files changed, 30 insertions, 47 deletions

diff --git a/src/multimedia/platform/darwin/mediaplayer/avfvideooutput_p.h b/src/multimedia/platform/darwin/mediaplayer/avfvideooutput_p.h
index 1721fbcf7..ad536b2f1 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfvideooutput_p.h
+++ b/src/multimedia/platform/darwin/mediaplayer/avfvideooutput_p.h
@@ -64,10 +64,6 @@ public:
     virtual void setLayer(CALayer *playerLayer) = 0;
 };
 
-#define AVFVideoOutput_iid \
-    "org.qt-project.qt.AVFVideoOutput/5.0"
-Q_DECLARE_INTERFACE(AVFVideoOutput, AVFVideoOutput_iid)
-
 QT_END_NAMESPACE
 
 #endif // AVFVIDEOOUTPUT_H
diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol_p.h b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol_p.h
index 6f31ad261..fd6821f8e 100644
--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol_p.h
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol_p.h
@@ -74,8 +74,7 @@ class QGstreamerAudioDecoderControl
         : public QAudioDecoderControl,
           public QGstreamerBusMessageFilter
 {
-Q_OBJECT
-Q_INTERFACES(QGstreamerBusMessageFilter)
+    Q_OBJECT
 
 public:
     QGstreamerAudioDecoderControl(QObject *parent);
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamerbushelper.cpp b/src/multimedia/platform/gstreamer/common/qgstreamerbushelper.cpp
index 2eb038dfa..059183fb6 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamerbushelper.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerbushelper.cpp
@@ -172,31 +172,33 @@ QGstreamerBusHelper::~QGstreamerBusHelper()
     gst_object_unref(GST_OBJECT(d->bus()));
 }
 
-void QGstreamerBusHelper::installMessageFilter(QObject *filter)
+void QGstreamerBusHelper::installMessageFilter(QGstreamerSyncMessageFilter *filter)
 {
-    auto syncFilter = qobject_cast<QGstreamerSyncMessageFilter*>(filter);
-    if (syncFilter) {
+    if (filter) {
         QMutexLocker lock(&d->filterMutex);
-        if (!d->syncFilters.contains(syncFilter))
-            d->syncFilters.append(syncFilter);
+        if (!d->syncFilters.contains(filter))
+            d->syncFilters.append(filter);
     }
-
-    auto busFilter = qobject_cast<QGstreamerBusMessageFilter*>(filter);
-    if (busFilter && !d->busFilters.contains(busFilter))
-        d->busFilters.append(busFilter);
 }
 
-void QGstreamerBusHelper::removeMessageFilter(QObject *filter)
+void QGstreamerBusHelper::removeMessageFilter(QGstreamerSyncMessageFilter *filter)
 {
-    auto syncFilter = qobject_cast<QGstreamerSyncMessageFilter*>(filter);
-    if (syncFilter) {
+    if (filter) {
         QMutexLocker lock(&d->filterMutex);
-        d->syncFilters.removeAll(syncFilter);
+        d->syncFilters.removeAll(filter);
     }
+}
+
+void QGstreamerBusHelper::installMessageFilter(QGstreamerBusMessageFilter *filter)
+{
+    if (filter && !d->busFilters.contains(filter))
+        d->busFilters.append(filter);
+}
 
-    auto busFilter = qobject_cast<QGstreamerBusMessageFilter*>(filter);
-    if (busFilter)
-        d->busFilters.removeAll(busFilter);
+void QGstreamerBusHelper::removeMessageFilter(QGstreamerBusMessageFilter *filter)
+{
+    if (filter)
+        d->busFilters.removeAll(filter);
 }
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamerbushelper_p.h b/src/multimedia/platform/gstreamer/common/qgstreamerbushelper_p.h
index 01d3ed826..f4e847de7 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamerbushelper_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerbushelper_p.h
@@ -65,8 +65,6 @@ public:
     //returns true if message was processed and should be dropped, false otherwise
     virtual bool processSyncMessage(const QGstreamerMessage &message) = 0;
 };
-#define QGstreamerSyncMessageFilter_iid "org.qt-project.qt.gstreamersyncmessagefilter/5.0"
-Q_DECLARE_INTERFACE(QGstreamerSyncMessageFilter, QGstreamerSyncMessageFilter_iid)
 
 
 class QGstreamerBusMessageFilter {
@@ -74,8 +72,6 @@ public:
     //returns true if message was processed and should be dropped, false otherwise
     virtual bool processBusMessage(const QGstreamerMessage &message) = 0;
 };
-#define QGstreamerBusMessageFilter_iid "org.qt-project.qt.gstreamerbusmessagefilter/5.0"
-Q_DECLARE_INTERFACE(QGstreamerBusMessageFilter, QGstreamerBusMessageFilter_iid)
 
 
 class QGstreamerBusHelperPrivate;
@@ -89,8 +85,10 @@ public:
     QGstreamerBusHelper(GstBus* bus, QObject* parent = 0);
     ~QGstreamerBusHelper();
 
-    void installMessageFilter(QObject *filter);
-    void removeMessageFilter(QObject *filter);
+    void installMessageFilter(QGstreamerSyncMessageFilter *filter);
+    void removeMessageFilter(QGstreamerSyncMessageFilter *filter);
+    void installMessageFilter(QGstreamerBusMessageFilter *filter);
+    void removeMessageFilter(QGstreamerBusMessageFilter *filter);
 
 signals:
     void message(QGstreamerMessage const& message);
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamerplayersession.cpp b/src/multimedia/platform/gstreamer/common/qgstreamerplayersession.cpp
index d63d7be89..bb76db405 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamerplayersession.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerplayersession.cpp
@@ -393,8 +393,8 @@ void QGstreamerPlayerSession::setBus(GstBus *bus)
     m_busHelper = new QGstreamerBusHelper(m_bus, this);
     m_busHelper->installMessageFilter(this);
 
-    if (m_videoOutput)
-        m_busHelper->installMessageFilter(m_videoOutput);
+//    if (m_videoOutput)
+//        m_busHelper->installMessageFilter(m_videoOutput);
 }
 
 qint64 QGstreamerPlayerSession::duration() const
@@ -661,8 +661,8 @@ void QGstreamerPlayerSession::setVideoRenderer(QAbstractVideoSurface *videoOutpu
         connect(m_videoOutput, SIGNAL(readyChanged(bool)),
                this, SLOT(updateVideoRenderer()));
 
-        m_busHelper->installMessageFilter(m_videoOutput);
-        m_renderer = qobject_cast<QGstreamerVideoRendererInterface*>(m_videoOutput);
+//        m_busHelper->installMessageFilter(m_videoOutput);
+        m_renderer = m_videoOutput;
         emit rendererChanged();
     }
 
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamerplayersession_p.h b/src/multimedia/platform/gstreamer/common/qgstreamerplayersession_p.h
index 80594e36a..84f50a07a 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamerplayersession_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerplayersession_p.h
@@ -85,8 +85,7 @@ class Q_MULTIMEDIA_EXPORT QGstreamerPlayerSession
     : public QObject
     , public QGstreamerBusMessageFilter
 {
-Q_OBJECT
-Q_INTERFACES(QGstreamerBusMessageFilter)
+    Q_OBJECT
 
 public:
     QGstreamerPlayerSession(QObject *parent);
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay_p.h
index 883da8a4d..0b4d765ef 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay_p.h
@@ -66,7 +66,6 @@ class Q_MULTIMEDIA_EXPORT QGstreamerVideoOverlay
         , private QGstreamerBufferProbe
 {
     Q_OBJECT
-    Q_INTERFACES(QGstreamerSyncMessageFilter QGstreamerBusMessageFilter)
 public:
     explicit QGstreamerVideoOverlay(QObject *parent = 0, const QByteArray &elementName = QByteArray());
     virtual ~QGstreamerVideoOverlay();
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideorenderer_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideorenderer_p.h
index 10d2c8e2e..cbc9a0328 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamervideorenderer_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideorenderer_p.h
@@ -63,7 +63,6 @@ QT_BEGIN_NAMESPACE
 class Q_MULTIMEDIA_EXPORT QGstreamerVideoRenderer : public QVideoRendererControl, public QGstreamerVideoRendererInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QGstreamerVideoRendererInterface)
 public:
     QGstreamerVideoRenderer(QObject *parent = 0);
     virtual ~QGstreamerVideoRenderer();
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideorendererinterface_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideorendererinterface_p.h
index af163c1b5..990024e4f 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamervideorendererinterface_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideorendererinterface_p.h
@@ -79,8 +79,6 @@ public:
     //void readyChanged(bool);
 };
 
-#define QGstreamerVideoRendererInterface_iid "org.qt-project.qt.gstreamervideorenderer/5.0"
-Q_DECLARE_INTERFACE(QGstreamerVideoRendererInterface, QGstreamerVideoRendererInterface_iid)
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamervideowindow_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideowindow_p.h
index cae656347..9f5d2c284 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamervideowindow_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideowindow_p.h
@@ -69,7 +69,6 @@ class Q_MULTIMEDIA_EXPORT QGstreamerVideoWindow :
         public QGstreamerBusMessageFilter
 {
     Q_OBJECT
-    Q_INTERFACES(QGstreamerVideoRendererInterface QGstreamerSyncMessageFilter QGstreamerBusMessageFilter)
 public:
     explicit QGstreamerVideoWindow(QObject *parent = 0, const QByteArray &elementName = QByteArray());
     ~QGstreamerVideoWindow();
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession.cpp
index e6ed85f9d..d8e3181c6 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession.cpp
@@ -71,7 +71,6 @@ QGstreamerCaptureSession::QGstreamerCaptureSession(QGstreamerCaptureSession::Cap
      m_waitingForEos(false),
      m_pipelineMode(EmptyPipeline),
      m_captureMode(captureMode),
-     m_viewfinder(0),
      m_viewfinderInterface(0),
      m_audioSrc(0),
      m_audioTee(0),
@@ -708,13 +707,11 @@ void QGstreamerCaptureSession::setVideoPreview(QAbstractVideoSurface *surface)
         m_viewfinderInterface = new QGstreamerVideoRenderer;
         bool oldReady = isReady();
 
-        connect(m_viewfinder, SIGNAL(sinkChanged()),
+        connect(m_viewfinderInterface, SIGNAL(sinkChanged()),
                    this, SIGNAL(viewfinderChanged()));
-        connect(m_viewfinder, SIGNAL(readyChanged(bool)),
+        connect(m_viewfinderInterface, SIGNAL(readyChanged(bool)),
                 this, SIGNAL(readyChanged(bool)));
 
-        m_busHelper->installMessageFilter(m_viewfinder);
-
         emit viewfinderChanged();
         if (oldReady != isReady())
             emit readyChanged(isReady());
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
index 50a43268c..d398e10b0 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
@@ -86,7 +86,6 @@ class QGstreamerCaptureSession
     Q_PROPERTY(qint64 duration READ duration NOTIFY durationChanged)
     Q_ENUMS(State)
     Q_ENUMS(CaptureMode)
-    Q_INTERFACES(QGstreamerBusMessageFilter)
 public:
     enum CaptureMode { Audio = 1,
                        Video = 2,
@@ -113,7 +112,6 @@ public:
 
     void setVideoDevice(const QCameraInfo &camera) { m_camera = camera; }
 
-    QObject *videoPreview() const { return m_viewfinder; }
     void setVideoPreview(QAbstractVideoSurface *viewfinder);
 
     void captureImage(int requestId, const QString &fileName);
@@ -179,7 +177,6 @@ private:
     QGstreamerCaptureSession::CaptureMode m_captureMode;
     QGstreamerMetaData m_metaData;
 
-    QObject *m_viewfinder;
     QGstreamerVideoRenderer *m_viewfinderInterface;
 
     QGstreamerImageCaptureControl *m_imageCaptureControl;