Remove QAudioProbe and QVideoProbe

They worked very inconsistently between platforms (or not at all)
and made the implementation quite a bit more complex.

Longer term they will get replaced by adding the possibility
to have multiple audio/video outputs and implementing monitoring
output classes that can deliver QAudioBuffers and QVideoFrames to
the app.

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

5 files changed, 0 insertions, 331 deletions

diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri
index 5a477a702..3f5b32c72 100644
--- a/src/multimedia/controls/controls.pri
+++ b/src/multimedia/controls/controls.pri
@@ -19,8 +19,6 @@ PUBLIC_HEADERS += \
     controls/qvideoencodersettingscontrol.h \
     controls/qvideorenderercontrol.h \
     controls/qvideowindowcontrol.h \
-    controls/qmediaaudioprobecontrol.h \
-    controls/qmediavideoprobecontrol.h \
 
 SOURCES += \
     controls/qcameracontrol.cpp \
@@ -37,8 +35,6 @@ SOURCES += \
     controls/qmetadatawritercontrol.cpp \
     controls/qvideorenderercontrol.cpp \
     controls/qvideowindowcontrol.cpp \
-    controls/qmediaaudioprobecontrol.cpp \
-    controls/qmediavideoprobecontrol.cpp \
     controls/qaudiodecodercontrol.cpp \
     controls/qvideoencodersettingscontrol.cpp \
     controls/qaudioencodersettingscontrol.cpp \
diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.cpp b/src/multimedia/controls/qmediaaudioprobecontrol.cpp
deleted file mode 100644
index 9bd028573..000000000
--- a/src/multimedia/controls/qmediaaudioprobecontrol.cpp
+++ /dev/null
@@ -1,97 +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 "qmediaaudioprobecontrol.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QMediaAudioProbeControl
-    \obsolete
-    \inmodule QtMultimedia
-
-
-    \ingroup multimedia_control
-
-    \brief The QMediaAudioProbeControl class allows control over probing audio data in media objects.
-
-    \l QAudioProbe is the client facing class for probing audio - this class is implemented by
-    media backends to provide this functionality.
-
-    The interface name of QMediaAudioProbeControl is \c org.qt-project.qt.mediaaudioprobecontrol/5.0 as
-    defined in QMediaAudioProbeControl_iid.
-
-    \sa QAudioProbe, QMediaService::requestControl(), QMediaPlayer, QCamera
-*/
-
-/*!
-    \macro QMediaAudioProbeControl_iid
-
-    \c org.qt-project.qt.mediaaudioprobecontrol/5.0
-
-    Defines the interface name of the QMediaAudioProbeControl class.
-
-    \relates QMediaAudioProbeControl
-*/
-
-/*!
-  Create a new media audio probe control object with the given \a parent.
-*/
-QMediaAudioProbeControl::QMediaAudioProbeControl(QObject *parent)
-    : QObject(parent)
-{
-}
-
-/*!
-    \fn QMediaAudioProbeControl::audioBufferProbed(const QAudioBuffer &buffer)
-
-    This signal should be emitted when an audio \a buffer is processed in the
-    media service.
-*/
-
-
-/*!
-    \fn QMediaAudioProbeControl::flush()
-
-    This signal should be emitted when it is required to release all frames.
-*/
-
-QT_END_NAMESPACE
-
-#include "moc_qmediaaudioprobecontrol.cpp"
diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.h b/src/multimedia/controls/qmediaaudioprobecontrol.h
deleted file mode 100644
index 7067b809e..000000000
--- a/src/multimedia/controls/qmediaaudioprobecontrol.h
+++ /dev/null
@@ -1,66 +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 QMEDIAAUDIOPROBECONTROL_H
-#define QMEDIAAUDIOPROBECONTROL_H
-
-#include <QtMultimedia/qmediaservice.h>
-
-QT_BEGIN_NAMESPACE
-
-class QAudioBuffer;
-class Q_MULTIMEDIA_EXPORT QMediaAudioProbeControl : public QObject
-{
-    Q_OBJECT
-
-Q_SIGNALS:
-    void audioBufferProbed(const QAudioBuffer &buffer);
-    void flush();
-
-protected:
-    explicit QMediaAudioProbeControl(QObject *parent = nullptr);
-};
-
-#define QMediaAudioProbeControl_iid "org.qt-project.qt.mediaaudioprobecontrol/5.0"
-Q_MEDIA_DECLARE_CONTROL(QMediaAudioProbeControl, QMediaAudioProbeControl_iid)
-
-QT_END_NAMESPACE
-
-
-#endif // QMEDIAAUDIOPROBECONTROL_H
diff --git a/src/multimedia/controls/qmediavideoprobecontrol.cpp b/src/multimedia/controls/qmediavideoprobecontrol.cpp
deleted file mode 100644
index d0a7640be..000000000
--- a/src/multimedia/controls/qmediavideoprobecontrol.cpp
+++ /dev/null
@@ -1,96 +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 "qmediavideoprobecontrol.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QMediaVideoProbeControl
-    \obsolete
-    \inmodule QtMultimedia
-
-
-    \ingroup multimedia_control
-
-    \brief The QMediaVideoProbeControl class allows control over probing video frames in media objects.
-
-    \l QVideoProbe is the client facing class for probing video - this class is implemented by
-    media backends to provide this functionality.
-
-    The interface name of QMediaVideoProbeControl is \c org.qt-project.qt.mediavideoprobecontrol/5.0 as
-    defined in QMediaVideoProbeControl_iid.
-
-    \sa QVideoProbe, QMediaService::requestControl(), QMediaPlayer, QCamera
-*/
-
-/*!
-    \macro QMediaVideoProbeControl_iid
-
-    \c org.qt-project.qt.mediavideoprobecontrol/5.0
-
-    Defines the interface name of the QMediaVideoProbeControl class.
-
-    \relates QMediaVideoProbeControl
-*/
-
-/*!
-  Create a new media video probe control object with the given \a parent.
-*/
-QMediaVideoProbeControl::QMediaVideoProbeControl(QObject *parent)
-    : QObject(parent)
-{
-}
-
-/*!
-    \fn QMediaVideoProbeControl::videoFrameProbed(const QVideoFrame &frame)
-
-    This signal should be emitted when a video \a frame is processed in the
-    media service.
-*/
-
-/*!
-    \fn QMediaVideoProbeControl::flush()
-
-    This signal should be emitted when it is required to release all frames.
-*/
-
-QT_END_NAMESPACE
-
-#include "moc_qmediavideoprobecontrol.cpp"
diff --git a/src/multimedia/controls/qmediavideoprobecontrol.h b/src/multimedia/controls/qmediavideoprobecontrol.h
deleted file mode 100644
index f291a3e0a..000000000
--- a/src/multimedia/controls/qmediavideoprobecontrol.h
+++ /dev/null
@@ -1,68 +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 QMEDIAVIDEOPROBECONTROL_H
-#define QMEDIAVIDEOPROBECONTROL_H
-
-#include <QtMultimedia/qmediaservice.h>
-
-QT_BEGIN_NAMESPACE
-
-class QVideoFrame;
-class Q_MULTIMEDIA_EXPORT QMediaVideoProbeControl : public QObject
-{
-    Q_OBJECT
-
-Q_SIGNALS:
-    void videoFrameProbed(const QVideoFrame &frame);
-    void flush();
-
-protected:
-    explicit QMediaVideoProbeControl(QObject *parent = nullptr);
-};
-
-#define QMediaVideoProbeControl_iid "org.qt-project.qt.mediavideoprobecontrol/5.0"
-Q_MEDIA_DECLARE_CONTROL(QMediaVideoProbeControl, QMediaVideoProbeControl_iid)
-
-QT_END_NAMESPACE
-
-
-#endif // QMEDIAVIDEOPROBECONTROL_H