Get rid of QGstreamerElementFactory

It's not used right now, and doesn't provide us with anything.

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

4 files changed, 13 insertions, 37 deletions

diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h
index 24eab3689..f3848c8c3 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h
@@ -64,7 +64,6 @@ class QGstreamerMessage;
 class QGstreamerBusHelper;
 class QGstreamerVideoRenderer;
 class QGstreamerVideoWindow;
-class QGstreamerElementFactory;
 class QGstreamerVideoInput;
 
 class QGstreamerCaptureService : public QMediaPlatformCaptureInterface
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession.cpp
index 528d295c9..45ed2afba 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_audioPreviewFactory(0),
      m_videoInputFactory(0),
      m_viewfinder(0),
      m_viewfinderInterface(0),
@@ -249,30 +248,24 @@ GstElement *QGstreamerCaptureSession::buildAudioPreview()
 {
     GstElement *previewElement = 0;
 
-    if (m_audioPreviewFactory) {
-        previewElement = m_audioPreviewFactory->buildElement();
-    } else {
-
-
 #if 1
-        previewElement = gst_element_factory_make("fakesink", "audio-preview");
+    previewElement = gst_element_factory_make("fakesink", "audio-preview");
 #else
-        GstElement *bin = gst_bin_new("audio-preview-bin");
-        GstElement *visual = gst_element_factory_make("libvisual_lv_scope", "audio-preview");
-        GstElement *sink = gst_element_factory_make("ximagesink", NULL);
-        gst_bin_add_many(GST_BIN(bin), visual, sink,  NULL);
-        gst_element_link_many(visual,sink, NULL);
+    GstElement *bin = gst_bin_new("audio-preview-bin");
+    GstElement *visual = gst_element_factory_make("libvisual_lv_scope", "audio-preview");
+    GstElement *sink = gst_element_factory_make("ximagesink", NULL);
+    gst_bin_add_many(GST_BIN(bin), visual, sink,  NULL);
+    gst_element_link_many(visual,sink, NULL);
 
 
-        // add ghostpads
-        GstPad *pad = gst_element_get_static_pad(visual, "sink");
-        Q_ASSERT(pad);
-        gst_element_add_pad(GST_ELEMENT(bin), gst_ghost_pad_new("audiosink", pad));
-        gst_object_unref(GST_OBJECT(pad));
+    // add ghostpads
+    GstPad *pad = gst_element_get_static_pad(visual, "sink");
+    Q_ASSERT(pad);
+    gst_element_add_pad(GST_ELEMENT(bin), gst_ghost_pad_new("audiosink", pad));
+    gst_object_unref(GST_OBJECT(pad));
 
-        previewElement = bin;
+    previewElement = bin;
 #endif
-    }
 
     return previewElement;
 }
@@ -712,11 +705,6 @@ bool QGstreamerCaptureSession::setOutputLocation(const QUrl& sink)
     return true;
 }
 
-void QGstreamerCaptureSession::setAudioPreview(QGstreamerElementFactory *audioPreview)
-{
-    m_audioPreviewFactory = audioPreview;
-}
-
 void QGstreamerCaptureSession::setVideoInput(QGstreamerVideoInput *videoInput)
 {
     m_videoInputFactory = videoInput;
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
index 56641af49..eb8c3a3bd 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
@@ -75,13 +75,6 @@ class QGstreamerVideoRendererInterface;
 class QCameraInfo;
 class QGstreamerVideoInput;
 
-class QGstreamerElementFactory
-{
-public:
-    virtual GstElement *buildElement() = 0;
-    virtual void prepareWinId() {}
-};
-
 class QGstreamerCaptureSession
         : public QObject
         , public QGstreamerBusMessageFilter
@@ -116,9 +109,6 @@ public:
 
     QGstreamerRecorderControl *recorderControl() const { return m_recorderControl; }
 
-    QGstreamerElementFactory *audioPreview() const { return m_audioPreviewFactory; }
-    void setAudioPreview(QGstreamerElementFactory *audioPreview);
-
     QGstreamerVideoInput *videoInput() const { return m_videoInputFactory; }
     void setVideoInput(QGstreamerVideoInput *videoInput);
 
@@ -187,7 +177,6 @@ private:
     QGstreamerCaptureSession::CaptureMode m_captureMode;
     QGstreamerMetaData m_metaData;
 
-    QGstreamerElementFactory *m_audioPreviewFactory;
     QGstreamerVideoInput *m_videoInputFactory;
     QObject *m_viewfinder;
     QGstreamerVideoRendererInterface *m_viewfinderInterface;
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamervideoinput_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamervideoinput_p.h
index 9f0313629..07f5ce166 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamervideoinput_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamervideoinput_p.h
@@ -62,7 +62,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QGstreamerVideoInput : public QGstreamerElementFactory
+class QGstreamerVideoInput
 {
 public:
     QGstreamerVideoInput();