Remove the unused QAudioOutputSelectorControl

QMediaPlayer didn't use it and it was only implemented for WMF. Remove
the control, but keep the code in WMF around for now, we'll need it
to implement proper audio output selection in the player.

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

3 files changed, 0 insertions, 204 deletions

diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri
index 65882e86c..d1435793b 100644
--- a/src/multimedia/controls/controls.pri
+++ b/src/multimedia/controls/controls.pri
@@ -4,7 +4,6 @@ INCLUDEPATH += controls
 PUBLIC_HEADERS += \
     controls/qaudiodecodercontrol.h \
     controls/qaudioencodersettingscontrol.h \
-    controls/qaudiooutputselectorcontrol.h \
     controls/qcameracontrol.h \
     controls/qcameraexposurecontrol.h \
     controls/qcamerafocuscontrol.h \
@@ -44,5 +43,4 @@ SOURCES += \
     controls/qaudiodecodercontrol.cpp \
     controls/qvideoencodersettingscontrol.cpp \
     controls/qaudioencodersettingscontrol.cpp \
-    controls/qaudiooutputselectorcontrol.cpp \
     controls/qvideodeviceselectorcontrol.cpp
diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp b/src/multimedia/controls/qaudiooutputselectorcontrol.cpp
deleted file mode 100644
index abb2568d8..000000000
--- a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp
+++ /dev/null
@@ -1,124 +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 "qaudiooutputselectorcontrol.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QAudioOutputSelectorControl
-    \obsolete
-
-    \brief The QAudioOutputSelectorControl class provides an audio output selector media control.
-    \inmodule QtMultimedia
-    \ingroup multimedia_control
-
-    The QAudioOutputSelectorControl class provides descriptions of the audio
-    outputs available on a system and allows one to be selected as the audio
-    output of a media service.
-
-    The interface name of QAudioOutputSelectorControl is \c org.qt-project.qt.audiooutputselectorcontrol/5.0 as
-    defined in QAudioOutputSelectorControl_iid.
-
-    \sa QMediaService::requestControl()
-*/
-
-/*!
-    \macro QAudioOutputSelectorControl_iid
-
-    \c org.qt-project.qt.audiooutputselectorcontrol/5.0
-
-    Defines the interface name of the QAudioOutputSelectorControl class.
-
-    \relates QAudioOutputSelectorControl
-*/
-
-/*!
-    Constructs a new audio output selector control with the given \a parent.
-*/
-QAudioOutputSelectorControl::QAudioOutputSelectorControl(QObject *parent)
-    :QObject(parent)
-{
-}
-
-/*!
-    \fn QList<QString> QAudioOutputSelectorControl::availableOutputs() const
-
-    Returns a list of the names of the available audio outputs.
-*/
-
-/*!
-    \fn QString QAudioOutputSelectorControl::outputDescription(const QString& name) const
-
-    Returns the description of the output \a name.
-*/
-
-/*!
-    \fn QString QAudioOutputSelectorControl::defaultOutput() const
-
-    Returns the name of the default audio output.
-*/
-
-/*!
-    \fn QString QAudioOutputSelectorControl::activeOutput() const
-
-    Returns the name of the currently selected audio output.
-*/
-
-/*!
-    \fn QAudioOutputSelectorControl::setActiveOutput(const QString& name)
-
-    Set the active audio output to \a name.
-*/
-
-/*!
-    \fn QAudioOutputSelectorControl::activeOutputChanged(const QString& name)
-
-    Signals that the audio output has changed to \a name.
-*/
-
-/*!
-    \fn QAudioOutputSelectorControl::availableOutputsChanged()
-
-    Signals that list of available outputs has changed.
-*/
-
-QT_END_NAMESPACE
-
-#include "moc_qaudiooutputselectorcontrol.cpp"
diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.h b/src/multimedia/controls/qaudiooutputselectorcontrol.h
deleted file mode 100644
index 01c4a1573..000000000
--- a/src/multimedia/controls/qaudiooutputselectorcontrol.h
+++ /dev/null
@@ -1,78 +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 QAUDIOOUTPUTSELECTORCONTROL_H
-#define QAUDIOOUTPUTSELECTORCONTROL_H
-
-#include <QtMultimedia/qaudio.h>
-#include <QtMultimedia/qmediaservice.h>
-
-QT_BEGIN_NAMESPACE
-
-
-// Class forward declaration required for QDoc bug
-class QString;
-class Q_MULTIMEDIA_EXPORT QAudioOutputSelectorControl : public QObject
-{
-    Q_OBJECT
-
-public:
-    virtual QList<QString> availableOutputs() const = 0;
-    virtual QString outputDescription(const QString& name) const = 0;
-    virtual QString defaultOutput() const = 0;
-    virtual QString activeOutput() const = 0;
-
-public Q_SLOTS:
-    virtual void setActiveOutput(const QString& name) = 0;
-
-Q_SIGNALS:
-    void activeOutputChanged(const QString& name);
-    void availableOutputsChanged();
-
-protected:
-    explicit QAudioOutputSelectorControl(QObject *parent = nullptr);
-};
-
-#define QAudioOutputSelectorControl_iid "org.qt-project.qt.audiooutputselectorcontrol/5.0"
-Q_MEDIA_DECLARE_CONTROL(QAudioOutputSelectorControl, QAudioOutputSelectorControl_iid)
-
-QT_END_NAMESPACE
-
-
-#endif // QAUDIOOUTPUTSELECTORCONTROL_H