Replaced endpoint control with audio input and output controls
Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
committed by
Qt by Nokia
parent
29a2d09a43
commit
ae728a4b1e
@@ -4,7 +4,8 @@ INCLUDEPATH += controls
|
||||
PUBLIC_HEADERS += \
|
||||
controls/qaudiodecodercontrol.h \
|
||||
controls/qaudioencodersettingscontrol.h \
|
||||
controls/qaudioendpointselectorcontrol.h \
|
||||
controls/qaudioinputselectorcontrol.h \
|
||||
controls/qaudiooutputselectorcontrol.h \
|
||||
controls/qcameracapturebufferformatcontrol.h \
|
||||
controls/qcameracapturedestinationcontrol.h \
|
||||
controls/qcameracontrol.h \
|
||||
@@ -74,7 +75,8 @@ SOURCES += \
|
||||
controls/qaudiodecodercontrol.cpp \
|
||||
controls/qvideoencodersettingscontrol.cpp \
|
||||
controls/qaudioencodersettingscontrol.cpp \
|
||||
controls/qaudioendpointselectorcontrol.cpp \
|
||||
controls/qaudioinputselectorcontrol.cpp \
|
||||
controls/qaudiooutputselectorcontrol.cpp \
|
||||
controls/qvideodeviceselectorcontrol.cpp
|
||||
|
||||
|
||||
|
||||
@@ -1,132 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/
|
||||
**
|
||||
** This file is part of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "qaudioendpointselectorcontrol.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
/*!
|
||||
\class QAudioEndpointSelectorControl
|
||||
|
||||
\brief The QAudioEndpointSelectorControl class provides an audio endpoint selector media control.
|
||||
\inmodule QtMultimedia
|
||||
\ingroup multimedia_control
|
||||
|
||||
The QAudioEndpointSelectorControl class provides descriptions of the audio
|
||||
endpoints available on a system and allows one to be selected as the audio
|
||||
of a media service.
|
||||
|
||||
The interface name of QAudioEndpointSelectorControl is \c org.qt-project.qt.audioendpointselectorcontrol/5.0 as
|
||||
defined in QAudioEndpointSelectorControl_iid.
|
||||
|
||||
\sa QMediaService::requestControl()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\macro QAudioEndpointSelectorControl_iid
|
||||
|
||||
\c org.qt-project.qt.audioendpointselectorcontrol/5.0
|
||||
|
||||
Defines the interface name of the QAudioEndpointSelectorControl class.
|
||||
|
||||
\relates QAudioEndpointSelectorControl
|
||||
*/
|
||||
|
||||
/*!
|
||||
Constructs a new audio endpoint selector control with the given \a parent.
|
||||
*/
|
||||
QAudioEndpointSelectorControl::QAudioEndpointSelectorControl(QObject *parent)
|
||||
:QMediaControl(parent)
|
||||
{
|
||||
}
|
||||
|
||||
/*!
|
||||
Destroys an audio endpoint selector control.
|
||||
*/
|
||||
QAudioEndpointSelectorControl::~QAudioEndpointSelectorControl()
|
||||
{
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QList<QString> QAudioEndpointSelectorControl::availableEndpoints() const
|
||||
|
||||
Returns a list of the names of the available audio endpoints.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QString QAudioEndpointSelectorControl::endpointDescription(const QString& name) const
|
||||
|
||||
Returns the description of the endpoint \a name.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QString QAudioEndpointSelectorControl::defaultEndpoint() const
|
||||
|
||||
Returns the name of the default audio endpoint.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QString QAudioEndpointSelectorControl::activeEndpoint() const
|
||||
|
||||
Returns the name of the currently selected audio endpoint.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QAudioEndpointSelectorControl::setActiveEndpoint(const QString& name)
|
||||
|
||||
Set the active audio endpoint to \a name.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QAudioEndpointSelectorControl::activeEndpointChanged(const QString& name)
|
||||
|
||||
Signals that the audio endpoint has changed to \a name.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QAudioEndpointSelectorControl::availableEndpointsChanged()
|
||||
|
||||
Signals that list of available endpoints has changed.
|
||||
*/
|
||||
|
||||
#include "moc_qaudioendpointselectorcontrol.cpp"
|
||||
QT_END_NAMESPACE
|
||||
|
||||
132
src/multimedia/controls/qaudioinputselectorcontrol.cpp
Normal file
132
src/multimedia/controls/qaudioinputselectorcontrol.cpp
Normal file
@@ -0,0 +1,132 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/
|
||||
**
|
||||
** This file is part of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "qaudioinputselectorcontrol.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
/*!
|
||||
\class QAudioInputSelectorControl
|
||||
|
||||
\brief The QAudioInputSelectorControl class provides an audio input selector media control.
|
||||
\inmodule QtMultimedia
|
||||
\ingroup multimedia_control
|
||||
|
||||
The QAudioInputSelectorControl class provides descriptions of the audio
|
||||
inputs available on a system and allows one to be selected as the audio
|
||||
input of a media service.
|
||||
|
||||
The interface name of QAudioInputSelectorControl is \c org.qt-project.qt.audioinputselectorcontrol/5.0 as
|
||||
defined in QAudioInputSelectorControl_iid.
|
||||
|
||||
\sa QMediaService::requestControl()
|
||||
*/
|
||||
|
||||
/*!
|
||||
\macro QAudioInputSelectorControl_iid
|
||||
|
||||
\c org.qt-project.qt.audioinputselectorcontrol/5.0
|
||||
|
||||
Defines the interface name of the QAudioInputSelectorControl class.
|
||||
|
||||
\relates QAudioInputSelectorControl
|
||||
*/
|
||||
|
||||
/*!
|
||||
Constructs a new audio input selector control with the given \a parent.
|
||||
*/
|
||||
QAudioInputSelectorControl::QAudioInputSelectorControl(QObject *parent)
|
||||
:QMediaControl(parent)
|
||||
{
|
||||
}
|
||||
|
||||
/*!
|
||||
Destroys an audio input selector control.
|
||||
*/
|
||||
QAudioInputSelectorControl::~QAudioInputSelectorControl()
|
||||
{
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QList<QString> QAudioInputSelectorControl::availableInputs() const
|
||||
|
||||
Returns a list of the names of the available audio inputs.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QString QAudioInputSelectorControl::inputDescription(const QString& name) const
|
||||
|
||||
Returns the description of the input \a name.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QString QAudioInputSelectorControl::defaultInput() const
|
||||
|
||||
Returns the name of the default audio input.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QString QAudioInputSelectorControl::activeInput() const
|
||||
|
||||
Returns the name of the currently selected audio input.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QAudioInputSelectorControl::setActiveInput(const QString& name)
|
||||
|
||||
Set the active audio input to \a name.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QAudioInputSelectorControl::activeInputChanged(const QString& name)
|
||||
|
||||
Signals that the audio input has changed to \a name.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QAudioInputSelectorControl::availableInputsChanged()
|
||||
|
||||
Signals that list of available inputs has changed.
|
||||
*/
|
||||
|
||||
#include "moc_qaudioinputselectorcontrol.cpp"
|
||||
QT_END_NAMESPACE
|
||||
|
||||
@@ -39,8 +39,8 @@
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QAUDIOENDPOINTSELECTORCONTROL_H
|
||||
#define QAUDIOENDPOINTSELECTORCONTROL_H
|
||||
#ifndef QAUDIOINPUTSELECTORCONTROL_H
|
||||
#define QAUDIOINPUTSELECTORCONTROL_H
|
||||
|
||||
#include <qaudio.h>
|
||||
#include <qmediacontrol.h>
|
||||
@@ -54,35 +54,35 @@ QT_MODULE(Multimedia)
|
||||
|
||||
// Class forward declaration required for QDoc bug
|
||||
class QString;
|
||||
class Q_MULTIMEDIA_EXPORT QAudioEndpointSelectorControl : public QMediaControl
|
||||
class Q_MULTIMEDIA_EXPORT QAudioInputSelectorControl : public QMediaControl
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
virtual ~QAudioEndpointSelectorControl();
|
||||
virtual ~QAudioInputSelectorControl();
|
||||
|
||||
virtual QList<QString> availableEndpoints() const = 0;
|
||||
virtual QString endpointDescription(const QString& name) const = 0;
|
||||
virtual QString defaultEndpoint() const = 0;
|
||||
virtual QString activeEndpoint() const = 0;
|
||||
virtual QList<QString> availableInputs() const = 0;
|
||||
virtual QString inputDescription(const QString& name) const = 0;
|
||||
virtual QString defaultInput() const = 0;
|
||||
virtual QString activeInput() const = 0;
|
||||
|
||||
public Q_SLOTS:
|
||||
virtual void setActiveEndpoint(const QString& name) = 0;
|
||||
virtual void setActiveInput(const QString& name) = 0;
|
||||
|
||||
Q_SIGNALS:
|
||||
void activeEndpointChanged(const QString& name);
|
||||
void availableEndpointsChanged();
|
||||
void activeInputChanged(const QString& name);
|
||||
void availableInputsChanged();
|
||||
|
||||
protected:
|
||||
QAudioEndpointSelectorControl(QObject *parent = 0);
|
||||
QAudioInputSelectorControl(QObject *parent = 0);
|
||||
};
|
||||
|
||||
#define QAudioEndpointSelectorControl_iid "org.qt-project.qt.audioendpointselectorcontrol/5.0"
|
||||
Q_MEDIA_DECLARE_CONTROL(QAudioEndpointSelectorControl, QAudioEndpointSelectorControl_iid)
|
||||
#define QAudioInputSelectorControl_iid "org.qt-project.qt.audioinputselectorcontrol/5.0"
|
||||
Q_MEDIA_DECLARE_CONTROL(QAudioInputSelectorControl, QAudioInputSelectorControl_iid)
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
QT_END_HEADER
|
||||
|
||||
|
||||
#endif // QAUDIOENDPOINTSELECTORCONTROL_H
|
||||
#endif // QAUDIOINPUTSELECTORCONTROL_H
|
||||
132
src/multimedia/controls/qaudiooutputselectorcontrol.cpp
Normal file
132
src/multimedia/controls/qaudiooutputselectorcontrol.cpp
Normal file
@@ -0,0 +1,132 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/
|
||||
**
|
||||
** This file is part of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "qaudiooutputselectorcontrol.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
/*!
|
||||
\class QAudioOutputSelectorControl
|
||||
|
||||
\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)
|
||||
:QMediaControl(parent)
|
||||
{
|
||||
}
|
||||
|
||||
/*!
|
||||
Destroys an audio output selector control.
|
||||
*/
|
||||
QAudioOutputSelectorControl::~QAudioOutputSelectorControl()
|
||||
{
|
||||
}
|
||||
|
||||
/*!
|
||||
\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.
|
||||
*/
|
||||
|
||||
#include "moc_qaudiooutputselectorcontrol.cpp"
|
||||
QT_END_NAMESPACE
|
||||
|
||||
88
src/multimedia/controls/qaudiooutputselectorcontrol.h
Normal file
88
src/multimedia/controls/qaudiooutputselectorcontrol.h
Normal file
@@ -0,0 +1,88 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/
|
||||
**
|
||||
** This file is part of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QAUDIOOUTPUTSELECTORCONTROL_H
|
||||
#define QAUDIOOUTPUTSELECTORCONTROL_H
|
||||
|
||||
#include <qaudio.h>
|
||||
#include <qmediacontrol.h>
|
||||
|
||||
QT_BEGIN_HEADER
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QT_MODULE(Multimedia)
|
||||
|
||||
|
||||
// Class forward declaration required for QDoc bug
|
||||
class QString;
|
||||
class Q_MULTIMEDIA_EXPORT QAudioOutputSelectorControl : public QMediaControl
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
virtual ~QAudioOutputSelectorControl();
|
||||
|
||||
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:
|
||||
QAudioOutputSelectorControl(QObject *parent = 0);
|
||||
};
|
||||
|
||||
#define QAudioOutputSelectorControl_iid "org.qt-project.qt.audiooutputselectorcontrol/5.0"
|
||||
Q_MEDIA_DECLARE_CONTROL(QAudioOutputSelectorControl, QAudioOutputSelectorControl_iid)
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
QT_END_HEADER
|
||||
|
||||
|
||||
#endif // QAUDIOOUTPUTSELECTORCONTROL_H
|
||||
Reference in New Issue
Block a user