Remove unused files

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

5 files changed, 1 insertions, 266 deletions

diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir
index d68049f63..e7dcc3dd6 100644
--- a/src/imports/multimedia/qmldir
+++ b/src/imports/multimedia/qmldir
@@ -4,3 +4,4 @@ classname QMultimediaDeclarativeModule
 typeinfo plugins.qmltypes
 typeinfo plugins.qmltypes
 Video 5.0 Video.qml
+
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index a13dd002e..ba5333f58 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -232,7 +232,6 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND use_came
         platform/gstreamer/camerabin/camerabincontrol.cpp platform/gstreamer/camerabin/camerabincontrol_p.h
         platform/gstreamer/camerabin/camerabinimageprocessing.cpp platform/gstreamer/camerabin/camerabinimageprocessing_p.h
         platform/gstreamer/camerabin/camerabinrecorder.cpp platform/gstreamer/camerabin/camerabinrecorder_p.h
-        platform/gstreamer/camerabin/camerabinservice.cpp platform/gstreamer/camerabin/camerabinservice_p.h
         platform/gstreamer/camerabin/camerabinsession.cpp platform/gstreamer/camerabin/camerabinsession_p.h
     DEFINES
         GST_USE_CAMERABIN
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabin.pri b/src/multimedia/platform/gstreamer/camerabin/camerabin.pri
index 4c598a7a2..ebe0ef664 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabin.pri
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabin.pri
@@ -1,13 +1,11 @@
 
 HEADERS += \
-    $$PWD/camerabinservice_p.h \
     $$PWD/camerabinsession_p.h \
     $$PWD/camerabincontrol_p.h \
     $$PWD/camerabinrecorder_p.h \
     $$PWD/camerabinimageprocessing_p.h \
 
 SOURCES += \
-    $$PWD/camerabinservice.cpp \
     $$PWD/camerabinsession.cpp \
     $$PWD/camerabincontrol.cpp \
     $$PWD/camerabinimageprocessing.cpp \
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinservice.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinservice.cpp
deleted file mode 100644
index d4565332c..000000000
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinservice.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtMultimedia/private/qtmultimediaglobal_p.h>
-#include "camerabinservice.h"
-#include "camerabinsession.h"
-#include "camerabinrecorder.h"
-#include "camerabinimageencoder.h"
-#include "camerabincontrol.h"
-#include "camerabinmetadata.h"
-
-#if QT_CONFIG(gstreamer_photography)
-#include "camerabinexposure.h"
-#include "camerabinfocus.h"
-#endif
-
-#include "camerabinimagecapture.h"
-#include "camerabinimageprocessing.h"
-#include <private/qgstreamerbushelper_p.h>
-#include <private/qgstutils_p.h>
-
-#include <private/qgstreamervideowindow_p.h>
-#include <private/qgstreamervideorenderer_p.h>
-
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-CameraBinService::CameraBinService(GstElementFactory *sourceFactory, QObject *parent)
-    : QMediaService(parent)
-{
-    m_captureSession = 0;
-    m_metaDataControl = 0;
-
-    m_videoOutput = 0;
-    m_videoRenderer = 0;
-    m_videoWindow = 0;
-    m_imageCaptureControl = 0;
-
-    m_captureSession = new CameraBinSession(sourceFactory, this);
-    m_imageCaptureControl = new CameraBinImageCapture(m_captureSession);
-
-    m_videoRenderer = new QGstreamerVideoRenderer(this);
-
-    m_videoWindow = new QGstreamerVideoWindow(this);
-    // If the GStreamer video sink is not available, don't provide the video window control since
-    // it won't work anyway.
-    if (!m_videoWindow->videoSink()) {
-        delete m_videoWindow;
-        m_videoWindow = 0;
-    }
-
-    m_metaDataControl = new CameraBinMetaData(this);
-    connect(m_metaDataControl, SIGNAL(metaDataChanged(QMap<QByteArray,QVariant>)),
-            m_captureSession, SLOT(setMetaData(QMap<QByteArray,QVariant>)));
-}
-
-CameraBinService::~CameraBinService()
-{
-}
-
-QObject *CameraBinService::requestControl(const char *name)
-{
-    if (!m_captureSession)
-        return 0;
-
-    if (!m_videoOutput) {
-        if (qstrcmp(name, QVideoRendererControl_iid) == 0) {
-            m_videoOutput = m_videoRenderer;
-        } else if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
-            m_videoOutput = m_videoWindow;
-        }
-
-        if (m_videoOutput) {
-            m_captureSession->setViewfinder(m_videoOutput);
-            return m_videoOutput;
-        }
-    }
-
-    if (qstrcmp(name,QMediaRecorderControl_iid) == 0)
-        return m_captureSession->recorderControl();
-
-    if (qstrcmp(name,QImageEncoderControl_iid) == 0)
-        return m_captureSession->imageEncodeControl();
-
-    if (qstrcmp(name,QCameraControl_iid) == 0)
-        return m_captureSession->cameraControl();
-
-    if (qstrcmp(name,QMetaDataWriterControl_iid) == 0)
-        return m_metaDataControl;
-
-    if (qstrcmp(name, QCameraImageCaptureControl_iid) == 0)
-        return m_imageCaptureControl;
-
-#if QT_CONFIG(gstreamer_photography)
-    if (qstrcmp(name, QCameraExposureControl_iid) == 0)
-        return m_captureSession->cameraExposureControl();
-
-    if (qstrcmp(name, QCameraFocusControl_iid) == 0)
-        return m_captureSession->cameraFocusControl();
-#endif
-
-    if (qstrcmp(name, QCameraImageProcessingControl_iid) == 0)
-        return m_captureSession->imageProcessingControl();
-
-    return nullptr;
-}
-
-void CameraBinService::releaseControl(QObject *control)
-{
-    if (control && control == m_videoOutput) {
-        m_videoOutput = 0;
-        m_captureSession->setViewfinder(0);
-    }
-}
-
-bool CameraBinService::isCameraBinAvailable()
-{
-    GstElementFactory *factory = gst_element_factory_find("camerabin");
-    if (factory) {
-        gst_object_unref(GST_OBJECT(factory));
-        return true;
-    }
-
-    return false;
-}
-
-QT_END_NAMESPACE
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinservice_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabinservice_p.h
deleted file mode 100644
index 32e06594c..000000000
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinservice_p.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef CAMERABINCAPTURESERVICE_H
-#define CAMERABINCAPTURESERVICE_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <qmediaservice.h>
-
-#include <gst/gst.h>
-
-QT_BEGIN_NAMESPACE
-
-class CameraBinSession;
-class CameraBinControl;
-class QGstreamerMessage;
-class QGstreamerBusHelper;
-class QGstreamerVideoRenderer;
-class QGstreamerVideoWindow;
-class QGstreamerElementFactory;
-class CameraBinMetaData;
-class CameraBinImageCapture;
-class CameraBinMetaData;
-
-class CameraBinService : public QMediaService
-{
-    Q_OBJECT
-
-public:
-    CameraBinService(GstElementFactory *sourceFactory, QObject *parent = 0);
-    virtual ~CameraBinService();
-
-    QObject *requestControl(const char *name) override;
-    void releaseControl(QObject *) override;
-
-    static bool isCameraBinAvailable();
-
-private:
-    void setAudioPreview(GstElement*);
-
-    CameraBinSession *m_captureSession;
-    CameraBinMetaData *m_metaDataControl;
-
-    QObject *m_videoOutput;
-
-    QObject *m_videoRenderer;
-    QGstreamerVideoWindow *m_videoWindow;
-    CameraBinImageCapture *m_imageCaptureControl;
-};
-
-QT_END_NAMESPACE
-
-#endif // CAMERABINCAPTURESERVICE_H