From bba28afe559837321a2083b3ce046ab774a7ef6b Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Wed, 20 Jun 2012 16:04:57 +1000 Subject: Rename a few controls. The encoder controls could be confused with actual encoding, so make clear they are just settings. Also, the end point selector controls were not named very well. Change-Id: I27f8bf9c865c5f295abad97c01ef98752af42613 Reviewed-by: Thomas McGuire Reviewed-by: Ling Hu --- .../qgstreameraudioinputendpointselector.cpp | 2 +- src/gsttools/qgstreamervideoinputdevicecontrol.cpp | 2 +- src/multimedia/camera/qcamera.cpp | 6 +- src/multimedia/camera/qcamerafocus.cpp | 2 +- src/multimedia/camera/qcameraimageprocessing.cpp | 2 +- src/multimedia/controls/controls.pri | 18 +-- src/multimedia/controls/qaudioencodercontrol.cpp | 141 ------------------ src/multimedia/controls/qaudioencodercontrol.h | 93 ------------ .../controls/qaudioencodersettingscontrol.cpp | 141 ++++++++++++++++++ .../controls/qaudioencodersettingscontrol.h | 93 ++++++++++++ src/multimedia/controls/qaudioendpointselector.cpp | 132 ----------------- src/multimedia/controls/qaudioendpointselector.h | 88 ----------- .../controls/qaudioendpointselectorcontrol.cpp | 132 +++++++++++++++++ .../controls/qaudioendpointselectorcontrol.h | 88 +++++++++++ src/multimedia/controls/qvideodevicecontrol.cpp | 144 ------------------ src/multimedia/controls/qvideodevicecontrol.h | 90 ------------ .../controls/qvideodeviceselectorcontrol.cpp | 144 ++++++++++++++++++ .../controls/qvideodeviceselectorcontrol.h | 90 ++++++++++++ src/multimedia/controls/qvideoencodercontrol.cpp | 162 --------------------- src/multimedia/controls/qvideoencodercontrol.h | 97 ------------ .../controls/qvideoencodersettingscontrol.cpp | 162 +++++++++++++++++++++ .../controls/qvideoencodersettingscontrol.h | 97 ++++++++++++ .../qgstreameraudioinputendpointselector_p.h | 4 +- .../qgstreamervideoinputdevicecontrol_p.h | 4 +- src/multimedia/qmediaserviceproviderplugin.h | 6 +- src/multimedia/recording/qaudiorecorder.cpp | 8 +- src/multimedia/recording/qmediaencodersettings.cpp | 4 +- src/multimedia/recording/qmediarecorder.cpp | 8 +- src/multimedia/recording/qmediarecorder_p.h | 8 +- src/multimediawidgets/qcameraviewfinder.cpp | 2 +- src/plugins/audiocapture/audiocaptureservice.cpp | 4 +- src/plugins/audiocapture/audioencodercontrol.cpp | 2 +- src/plugins/audiocapture/audioencodercontrol.h | 4 +- src/plugins/audiocapture/audioendpointselector.cpp | 2 +- src/plugins/audiocapture/audioendpointselector.h | 4 +- src/plugins/directshow/camera/dscameraservice.cpp | 2 +- .../directshow/camera/dsvideodevicecontrol.cpp | 2 +- .../directshow/camera/dsvideodevicecontrol.h | 4 +- .../player/directshowaudioendpointcontrol.cpp | 2 +- .../player/directshowaudioendpointcontrol.h | 4 +- .../directshow/player/directshowplayerservice.cpp | 2 +- .../gstreamer/camerabin/camerabinaudioencoder.cpp | 2 +- .../gstreamer/camerabin/camerabinaudioencoder.h | 4 +- .../gstreamer/camerabin/camerabinservice.cpp | 8 +- src/plugins/gstreamer/camerabin/camerabinservice.h | 8 +- .../gstreamer/camerabin/camerabinvideoencoder.cpp | 2 +- .../gstreamer/camerabin/camerabinvideoencoder.h | 4 +- .../mediacapture/qgstreameraudioencode.cpp | 2 +- .../gstreamer/mediacapture/qgstreameraudioencode.h | 4 +- .../mediacapture/qgstreamercaptureservice.cpp | 8 +- .../mediacapture/qgstreamercaptureservice.h | 8 +- .../mediacapture/qgstreamervideoencode.cpp | 2 +- .../gstreamer/mediacapture/qgstreamervideoencode.h | 4 +- src/plugins/wmf/player/mfaudioendpointcontrol.cpp | 2 +- src/plugins/wmf/player/mfaudioendpointcontrol.h | 4 +- src/plugins/wmf/player/mfplayerservice.cpp | 2 +- 56 files changed, 1033 insertions(+), 1033 deletions(-) delete mode 100644 src/multimedia/controls/qaudioencodercontrol.cpp delete mode 100644 src/multimedia/controls/qaudioencodercontrol.h create mode 100644 src/multimedia/controls/qaudioencodersettingscontrol.cpp create mode 100644 src/multimedia/controls/qaudioencodersettingscontrol.h delete mode 100644 src/multimedia/controls/qaudioendpointselector.cpp delete mode 100644 src/multimedia/controls/qaudioendpointselector.h create mode 100644 src/multimedia/controls/qaudioendpointselectorcontrol.cpp create mode 100644 src/multimedia/controls/qaudioendpointselectorcontrol.h delete mode 100644 src/multimedia/controls/qvideodevicecontrol.cpp delete mode 100644 src/multimedia/controls/qvideodevicecontrol.h create mode 100644 src/multimedia/controls/qvideodeviceselectorcontrol.cpp create mode 100644 src/multimedia/controls/qvideodeviceselectorcontrol.h delete mode 100644 src/multimedia/controls/qvideoencodercontrol.cpp delete mode 100644 src/multimedia/controls/qvideoencodercontrol.h create mode 100644 src/multimedia/controls/qvideoencodersettingscontrol.cpp create mode 100644 src/multimedia/controls/qvideoencodersettingscontrol.h (limited to 'src') diff --git a/src/gsttools/qgstreameraudioinputendpointselector.cpp b/src/gsttools/qgstreameraudioinputendpointselector.cpp index ddbdc7525..1f9abd7be 100644 --- a/src/gsttools/qgstreameraudioinputendpointselector.cpp +++ b/src/gsttools/qgstreameraudioinputendpointselector.cpp @@ -51,7 +51,7 @@ #endif QGstreamerAudioInputEndpointSelector::QGstreamerAudioInputEndpointSelector(QObject *parent) - :QAudioEndpointSelector(parent) + :QAudioEndpointSelectorControl(parent) { update(); } diff --git a/src/gsttools/qgstreamervideoinputdevicecontrol.cpp b/src/gsttools/qgstreamervideoinputdevicecontrol.cpp index 5fe9ca705..7aaf654dd 100644 --- a/src/gsttools/qgstreamervideoinputdevicecontrol.cpp +++ b/src/gsttools/qgstreamervideoinputdevicecontrol.cpp @@ -57,7 +57,7 @@ #include QGstreamerVideoInputDeviceControl::QGstreamerVideoInputDeviceControl(QObject *parent) - :QVideoDeviceControl(parent), m_selectedDevice(0) + :QVideoDeviceSelectorControl(parent), m_selectedDevice(0) { update(); } diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 3a19119a5..063e28093 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include @@ -122,7 +122,7 @@ public: QMediaServiceProvider *provider; QCameraControl *control; - QVideoDeviceControl *deviceControl; + QVideoDeviceSelectorControl *deviceControl; QCameraLocksControl *locksControl; QCameraExposure *cameraExposure; @@ -245,7 +245,7 @@ void QCameraPrivate::initControls() if (service) { control = qobject_cast(service->requestControl(QCameraControl_iid)); locksControl = qobject_cast(service->requestControl(QCameraLocksControl_iid)); - deviceControl = qobject_cast(service->requestControl(QVideoDeviceControl_iid)); + deviceControl = qobject_cast(service->requestControl(QVideoDeviceSelectorControl_iid)); if (control) { q->connect(control, SIGNAL(stateChanged(QCamera::State)), q, SLOT(_q_updateState(QCamera::State))); diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp index 198794158..d4f096bc9 100644 --- a/src/multimedia/camera/qcamerafocus.cpp +++ b/src/multimedia/camera/qcamerafocus.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp index b867f3596..e6a1129d2 100644 --- a/src/multimedia/camera/qcameraimageprocessing.cpp +++ b/src/multimedia/camera/qcameraimageprocessing.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri index dec892a84..03bab2ffb 100644 --- a/src/multimedia/controls/controls.pri +++ b/src/multimedia/controls/controls.pri @@ -3,8 +3,8 @@ INCLUDEPATH += controls PUBLIC_HEADERS += \ controls/qaudiodecodercontrol.h \ - controls/qaudioencodercontrol.h \ - controls/qaudioendpointselector.h \ + controls/qaudioencodersettingscontrol.h \ + controls/qaudioendpointselectorcontrol.h \ controls/qcameracapturebufferformatcontrol.h \ controls/qcameracapturedestinationcontrol.h \ controls/qcameracontrol.h \ @@ -28,8 +28,8 @@ PUBLIC_HEADERS += \ controls/qmetadatawritercontrol.h \ controls/qradiodatacontrol.h \ controls/qradiotunercontrol.h \ - controls/qvideodevicecontrol.h \ - controls/qvideoencodercontrol.h \ + controls/qvideodeviceselectorcontrol.h \ + controls/qvideoencodersettingscontrol.h \ controls/qvideorenderercontrol.h \ controls/qvideowindowcontrol.h \ controls/qmediaaudioprobecontrol.h \ @@ -41,8 +41,6 @@ PRIVATE_HEADERS += \ controls/qmediaplaylistsourcecontrol_p.h SOURCES += \ - controls/qaudioencodercontrol.cpp \ - controls/qaudioendpointselector.cpp \ controls/qcameracapturebufferformatcontrol.cpp \ controls/qcameracapturedestinationcontrol.cpp \ controls/qcameracontrol.cpp \ @@ -68,13 +66,15 @@ SOURCES += \ controls/qmetadatawritercontrol.cpp \ controls/qradiodatacontrol.cpp \ controls/qradiotunercontrol.cpp \ - controls/qvideodevicecontrol.cpp \ - controls/qvideoencodercontrol.cpp \ controls/qvideorenderercontrol.cpp \ controls/qvideowindowcontrol.cpp \ controls/qmediaaudioprobecontrol.cpp \ controls/qmediavideoprobecontrol.cpp \ controls/qmediaavailabilitycontrol.cpp \ - controls/qaudiodecodercontrol.cpp + controls/qaudiodecodercontrol.cpp \ + controls/qvideoencodersettingscontrol.cpp \ + controls/qaudioencodersettingscontrol.cpp \ + controls/qaudioendpointselectorcontrol.cpp \ + controls/qvideodeviceselectorcontrol.cpp diff --git a/src/multimedia/controls/qaudioencodercontrol.cpp b/src/multimedia/controls/qaudioencodercontrol.cpp deleted file mode 100644 index 92f9e350d..000000000 --- a/src/multimedia/controls/qaudioencodercontrol.cpp +++ /dev/null @@ -1,141 +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 "qaudioencodercontrol.h" -#include - -QT_BEGIN_NAMESPACE - - -/*! - \class QAudioEncoderControl - \inmodule QtMultimedia - - \ingroup multimedia_control - - \brief The QAudioEncoderControl class provides access to the settings of a - media service that performs audio encoding. - - If a QMediaService supports encoding audio data it will implement - QAudioEncoderControl. This control provides information about the limits - of restricted audio encoder options and allows the selection of a set of - audio encoder settings as specified in a QAudioEncoderSettings object. - - The functionality provided by this control is exposed to application code through the - QMediaRecorder class. - - The interface name of QAudioEncoderControl is \c org.qt-project.qt.audioencodercontrol/5.0 as - defined in QAudioEncoderControl_iid. - - \sa QMediaService::requestControl(), QMediaRecorder -*/ - -/*! - \macro QAudioEncoderControl_iid - - \c org.qt-project.qt.audioencodercontrol/5.0 - - Defines the interface name of the QAudioEncoderControl class. - - \relates QAudioEncoderControl -*/ - -/*! - Create a new audio encode control object with the given \a parent. -*/ -QAudioEncoderControl::QAudioEncoderControl(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys the audio encode control. -*/ -QAudioEncoderControl::~QAudioEncoderControl() -{ -} - -/*! - \fn QAudioEncoderControl::supportedAudioCodecs() const - - Returns the list of supported audio codec names. -*/ - -/*! - \fn QAudioEncoderControl::codecDescription(const QString &codec) const - - Returns description of audio \a codec. -*/ - -/*! - \fn QAudioEncoderControl::supportedSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(), - bool *continuous) const - - Returns the list of supported audio sample rates, if known. - - If non null audio \a settings parameter is passed, - the returned list is reduced to sample rates supported with partial settings applied. - - It can be used for example to query the list of sample rates, supported by specific audio codec. - - If the encoder supports arbitrary sample rates within the supported rates range, - *\a continuous is set to true, otherwise *\a continuous is set to false. -*/ - -/*! - \fn QAudioEncoderControl::audioSettings() const - - Returns the audio encoder settings. - - The returned value may be different tha passed to QAudioEncoderControl::setAudioSettings() - if the settings contains the default or undefined parameters. - In this case if the undefined parameters are already resolved, they should be returned. -*/ - -/*! - \fn QAudioEncoderControl::setAudioSettings(const QAudioEncoderSettings &settings) - - Sets the selected audio \a settings. -*/ - -#include "moc_qaudioencodercontrol.cpp" -QT_END_NAMESPACE - diff --git a/src/multimedia/controls/qaudioencodercontrol.h b/src/multimedia/controls/qaudioencodercontrol.h deleted file mode 100644 index 6b81f3345..000000000 --- a/src/multimedia/controls/qaudioencodercontrol.h +++ /dev/null @@ -1,93 +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$ -** -****************************************************************************/ - -#ifndef QAUDIOENCODERCONTROL_H -#define QAUDIOENCODERCONTROL_H - -#include "qmediacontrol.h" -#include "qmediarecorder.h" -#include -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Multimedia) - -class QStringList; -class QAudioFormat; -QT_END_NAMESPACE - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QAudioEncoderControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QAudioEncoderControl(); - - virtual QStringList supportedAudioCodecs() const = 0; - virtual QString codecDescription(const QString &codecName) const = 0; - - virtual QList supportedSampleRates(const QAudioEncoderSettings &settings, - bool *continuous = 0) const = 0; - - virtual QAudioEncoderSettings audioSettings() const = 0; - virtual void setAudioSettings(const QAudioEncoderSettings&) = 0; - -protected: - QAudioEncoderControl(QObject *parent = 0); -}; - -#define QAudioEncoderControl_iid "org.qt-project.qt.audioencodercontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QAudioEncoderControl, QAudioEncoderControl_iid) - -QT_END_NAMESPACE - -QT_END_HEADER - - -#endif // QAUDIOCAPTUREPROPERTIESCONTROL_H diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.cpp b/src/multimedia/controls/qaudioencodersettingscontrol.cpp new file mode 100644 index 000000000..73f2379fa --- /dev/null +++ b/src/multimedia/controls/qaudioencodersettingscontrol.cpp @@ -0,0 +1,141 @@ +/**************************************************************************** +** +** 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 "qaudioencodersettingscontrol.h" +#include + +QT_BEGIN_NAMESPACE + + +/*! + \class QAudioEncoderSettingsControl + \inmodule QtMultimedia + + \ingroup multimedia_control + + \brief The QAudioEncoderSettingsControl class provides access to the settings of a + media service that performs audio encoding. + + If a QMediaService supports encoding audio data it will implement + QAudioEncoderSettingsControl. This control provides information about the limits + of restricted audio encoder options and allows the selection of a set of + audio encoder settings as specified in a QAudioEncoderSettings object. + + The functionality provided by this control is exposed to application code through the + QMediaRecorder class. + + The interface name of QAudioEncoderSettingsControl is \c org.qt-project.qt.audioencodersettingscontrol/5.0 as + defined in QAudioEncoderSettingsControl_iid. + + \sa QMediaService::requestControl(), QMediaRecorder +*/ + +/*! + \macro QAudioEncoderSettingsControl_iid + + \c org.qt-project.qt.audioencodersettingscontrol/5.0 + + Defines the interface name of the QAudioEncoderSettingsControl class. + + \relates QAudioEncoderSettingsControl +*/ + +/*! + Create a new audio encoder settings control object with the given \a parent. +*/ +QAudioEncoderSettingsControl::QAudioEncoderSettingsControl(QObject *parent) + :QMediaControl(parent) +{ +} + +/*! + Destroys the audio encoder settings control. +*/ +QAudioEncoderSettingsControl::~QAudioEncoderSettingsControl() +{ +} + +/*! + \fn QAudioEncoderSettingsControl::supportedAudioCodecs() const + + Returns the list of supported audio codec names. +*/ + +/*! + \fn QAudioEncoderSettingsControl::codecDescription(const QString &codec) const + + Returns description of audio \a codec. +*/ + +/*! + \fn QAudioEncoderSettingsControl::supportedSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(), + bool *continuous) const + + Returns the list of supported audio sample rates, if known. + + If non null audio \a settings parameter is passed, + the returned list is reduced to sample rates supported with partial settings applied. + + It can be used for example to query the list of sample rates, supported by specific audio codec. + + If the encoder supports arbitrary sample rates within the supported rates range, + *\a continuous is set to true, otherwise *\a continuous is set to false. +*/ + +/*! + \fn QAudioEncoderSettingsControl::audioSettings() const + + Returns the audio encoder settings. + + The returned value may be different tha passed to QAudioEncoderSettingsControl::setAudioSettings() + if the settings contains the default or undefined parameters. + In this case if the undefined parameters are already resolved, they should be returned. +*/ + +/*! + \fn QAudioEncoderSettingsControl::setAudioSettings(const QAudioEncoderSettings &settings) + + Sets the selected audio \a settings. +*/ + +#include "moc_qaudioencodersettingscontrol.cpp" +QT_END_NAMESPACE + diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.h b/src/multimedia/controls/qaudioencodersettingscontrol.h new file mode 100644 index 000000000..a0e0ea8eb --- /dev/null +++ b/src/multimedia/controls/qaudioencodersettingscontrol.h @@ -0,0 +1,93 @@ +/**************************************************************************** +** +** 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 QAUDIOENCODERSETTINGSCONTROL_H +#define QAUDIOENCODERSETTINGSCONTROL_H + +#include "qmediacontrol.h" +#include "qmediarecorder.h" +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Multimedia) + +class QStringList; +class QAudioFormat; +QT_END_NAMESPACE + +QT_BEGIN_NAMESPACE + +// Required for QDoc workaround +class QString; + +class Q_MULTIMEDIA_EXPORT QAudioEncoderSettingsControl : public QMediaControl +{ + Q_OBJECT + +public: + virtual ~QAudioEncoderSettingsControl(); + + virtual QStringList supportedAudioCodecs() const = 0; + virtual QString codecDescription(const QString &codecName) const = 0; + + virtual QList supportedSampleRates(const QAudioEncoderSettings &settings, + bool *continuous = 0) const = 0; + + virtual QAudioEncoderSettings audioSettings() const = 0; + virtual void setAudioSettings(const QAudioEncoderSettings&) = 0; + +protected: + QAudioEncoderSettingsControl(QObject *parent = 0); +}; + +#define QAudioEncoderSettingsControl_iid "org.qt-project.qt.audioencodersettingscontrol/5.0" +Q_MEDIA_DECLARE_CONTROL(QAudioEncoderSettingsControl, QAudioEncoderSettingsControl_iid) + +QT_END_NAMESPACE + +QT_END_HEADER + + +#endif // QAUDIOENCODERSETTINGSCONTROL_H diff --git a/src/multimedia/controls/qaudioendpointselector.cpp b/src/multimedia/controls/qaudioendpointselector.cpp deleted file mode 100644 index ff5c6e8a9..000000000 --- a/src/multimedia/controls/qaudioendpointselector.cpp +++ /dev/null @@ -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 "qaudioendpointselector.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QAudioEndpointSelector - - \brief The QAudioEndpointSelector class provides an audio endpoint selector media control. - \inmodule QtMultimedia - \ingroup multimedia_control - - The QAudioEndpointSelector 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 QAudioEndpointSelector is \c org.qt-project.qt.audioendpointselector/5.0 as - defined in QAudioEndpointSelector_iid. - - \sa QMediaService::requestControl() -*/ - -/*! - \macro QAudioEndpointSelector_iid - - \c org.qt-project.qt.audioendpointselector/5.0 - - Defines the interface name of the QAudioEndpointSelector class. - - \relates QAudioEndpointSelector -*/ - -/*! - Constructs a new audio endpoint selector with the given \a parent. -*/ -QAudioEndpointSelector::QAudioEndpointSelector(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys an audio endpoint selector. -*/ -QAudioEndpointSelector::~QAudioEndpointSelector() -{ -} - -/*! - \fn QList QAudioEndpointSelector::availableEndpoints() const - - Returns a list of the names of the available audio endpoints. -*/ - -/*! - \fn QString QAudioEndpointSelector::endpointDescription(const QString& name) const - - Returns the description of the endpoint \a name. -*/ - -/*! - \fn QString QAudioEndpointSelector::defaultEndpoint() const - - Returns the name of the default audio endpoint. -*/ - -/*! - \fn QString QAudioEndpointSelector::activeEndpoint() const - - Returns the name of the currently selected audio endpoint. -*/ - -/*! - \fn QAudioEndpointSelector::setActiveEndpoint(const QString& name) - - Set the active audio endpoint to \a name. -*/ - -/*! - \fn QAudioEndpointSelector::activeEndpointChanged(const QString& name) - - Signals that the audio endpoint has changed to \a name. -*/ - -/*! - \fn QAudioEndpointSelector::availableEndpointsChanged() - - Signals that list of available endpoints has changed. -*/ - -#include "moc_qaudioendpointselector.cpp" -QT_END_NAMESPACE - diff --git a/src/multimedia/controls/qaudioendpointselector.h b/src/multimedia/controls/qaudioendpointselector.h deleted file mode 100644 index 97c9f00a6..000000000 --- a/src/multimedia/controls/qaudioendpointselector.h +++ /dev/null @@ -1,88 +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$ -** -****************************************************************************/ - -#ifndef QAUDIOENDPOINTSELECTOR_H -#define QAUDIOENDPOINTSELECTOR_H - -#include -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Multimedia) - - -// Class forward declaration required for QDoc bug -class QString; -class Q_MULTIMEDIA_EXPORT QAudioEndpointSelector : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QAudioEndpointSelector(); - - virtual QList availableEndpoints() const = 0; - virtual QString endpointDescription(const QString& name) const = 0; - virtual QString defaultEndpoint() const = 0; - virtual QString activeEndpoint() const = 0; - -public Q_SLOTS: - virtual void setActiveEndpoint(const QString& name) = 0; - -Q_SIGNALS: - void activeEndpointChanged(const QString& name); - void availableEndpointsChanged(); - -protected: - QAudioEndpointSelector(QObject *parent = 0); -}; - -#define QAudioEndpointSelector_iid "org.qt-project.qt.audioendpointselector/5.0" -Q_MEDIA_DECLARE_CONTROL(QAudioEndpointSelector, QAudioEndpointSelector_iid) - -QT_END_NAMESPACE - -QT_END_HEADER - - -#endif // QAUDIOENDPOINTSELECTOR_H diff --git a/src/multimedia/controls/qaudioendpointselectorcontrol.cpp b/src/multimedia/controls/qaudioendpointselectorcontrol.cpp new file mode 100644 index 000000000..096389b59 --- /dev/null +++ b/src/multimedia/controls/qaudioendpointselectorcontrol.cpp @@ -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 "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 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 + diff --git a/src/multimedia/controls/qaudioendpointselectorcontrol.h b/src/multimedia/controls/qaudioendpointselectorcontrol.h new file mode 100644 index 000000000..9ddc767d5 --- /dev/null +++ b/src/multimedia/controls/qaudioendpointselectorcontrol.h @@ -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 QAUDIOENDPOINTSELECTORCONTROL_H +#define QAUDIOENDPOINTSELECTORCONTROL_H + +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Multimedia) + + +// Class forward declaration required for QDoc bug +class QString; +class Q_MULTIMEDIA_EXPORT QAudioEndpointSelectorControl : public QMediaControl +{ + Q_OBJECT + +public: + virtual ~QAudioEndpointSelectorControl(); + + virtual QList availableEndpoints() const = 0; + virtual QString endpointDescription(const QString& name) const = 0; + virtual QString defaultEndpoint() const = 0; + virtual QString activeEndpoint() const = 0; + +public Q_SLOTS: + virtual void setActiveEndpoint(const QString& name) = 0; + +Q_SIGNALS: + void activeEndpointChanged(const QString& name); + void availableEndpointsChanged(); + +protected: + QAudioEndpointSelectorControl(QObject *parent = 0); +}; + +#define QAudioEndpointSelectorControl_iid "org.qt-project.qt.audioendpointselectorcontrol/5.0" +Q_MEDIA_DECLARE_CONTROL(QAudioEndpointSelectorControl, QAudioEndpointSelectorControl_iid) + +QT_END_NAMESPACE + +QT_END_HEADER + + +#endif // QAUDIOENDPOINTSELECTORCONTROL_H diff --git a/src/multimedia/controls/qvideodevicecontrol.cpp b/src/multimedia/controls/qvideodevicecontrol.cpp deleted file mode 100644 index d7941e5f7..000000000 --- a/src/multimedia/controls/qvideodevicecontrol.cpp +++ /dev/null @@ -1,144 +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 "qvideodevicecontrol.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QVideoDeviceControl - - \brief The QVideoDeviceControl class provides an video device selector media control. - \inmodule QtMultimedia - - - \ingroup multimedia_control - - The QVideoDeviceControl class provides descriptions of the video devices - available on a system and allows one to be selected as the endpoint of a - media service. - - The interface name of QVideoDeviceControl is \c org.qt-project.qt.videodevicecontrol/5.0 as - defined in QVideoDeviceControl_iid. -*/ - -/*! - \macro QVideoDeviceControl_iid - - \c org.qt-project.qt.videodevicecontrol/5.0 - - Defines the interface name of the QVideoDeviceControl class. - - \relates QVideoDeviceControl -*/ - -/*! - Constructs a video device control with the given \a parent. -*/ -QVideoDeviceControl::QVideoDeviceControl(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys a video device control. -*/ -QVideoDeviceControl::~QVideoDeviceControl() -{ -} - -/*! - \fn QVideoDeviceControl::deviceCount() const - - Returns the number of available video devices; -*/ - -/*! - \fn QVideoDeviceControl::deviceName(int index) const - - Returns the name of the video device at \a index. -*/ - -/*! - \fn QVideoDeviceControl::deviceDescription(int index) const - - Returns a description of the video device at \a index. -*/ - -/*! - \fn QVideoDeviceControl::defaultDevice() const - - Returns the index of the default video device. -*/ - -/*! - \fn QVideoDeviceControl::selectedDevice() const - - Returns the index of the selected video device. -*/ - -/*! - \fn QVideoDeviceControl::setSelectedDevice(int index) - - Sets the selected video device \a index. -*/ - -/*! - \fn QVideoDeviceControl::devicesChanged() - - Signals that the list of available video devices has changed. -*/ - -/*! - \fn QVideoDeviceControl::selectedDeviceChanged(int index) - - Signals that the selected video device \a index has changed. -*/ - -/*! - \fn QVideoDeviceControl::selectedDeviceChanged(const QString &name) - - Signals that the selected video device \a name has changed. -*/ - -#include "moc_qvideodevicecontrol.cpp" -QT_END_NAMESPACE - diff --git a/src/multimedia/controls/qvideodevicecontrol.h b/src/multimedia/controls/qvideodevicecontrol.h deleted file mode 100644 index 1ea65dc81..000000000 --- a/src/multimedia/controls/qvideodevicecontrol.h +++ /dev/null @@ -1,90 +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$ -** -****************************************************************************/ - -#ifndef QVIDEODEVICECONTROL_H -#define QVIDEODEVICECONTROL_H - -#include "qmediacontrol.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Multimedia) - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QVideoDeviceControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QVideoDeviceControl(); - - virtual int deviceCount() const = 0; - - virtual QString deviceName(int index) const = 0; - virtual QString deviceDescription(int index) const = 0; - - virtual int defaultDevice() const = 0; - virtual int selectedDevice() const = 0; - -public Q_SLOTS: - virtual void setSelectedDevice(int index) = 0; - -Q_SIGNALS: - void selectedDeviceChanged(int index); - void selectedDeviceChanged(const QString &deviceName); - void devicesChanged(); - -protected: - QVideoDeviceControl(QObject *parent = 0); -}; - -#define QVideoDeviceControl_iid "org.qt-project.qt.videodevicecontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QVideoDeviceControl, QVideoDeviceControl_iid) - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QVIDEODEVICECONTROL_H diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.cpp b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp new file mode 100644 index 000000000..85a776f8b --- /dev/null +++ b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp @@ -0,0 +1,144 @@ +/**************************************************************************** +** +** 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 "qvideodeviceselectorcontrol.h" + +QT_BEGIN_NAMESPACE + +/*! + \class QVideoDeviceSelectorControl + + \brief The QVideoDeviceSelectorControl class provides an video device selector media control. + \inmodule QtMultimedia + + + \ingroup multimedia_control + + The QVideoDeviceSelectorControl class provides descriptions of the video devices + available on a system and allows one to be selected as the endpoint of a + media service. + + The interface name of QVideoDeviceSelectorControl is \c org.qt-project.qt.videodeviceselectorcontrol/5.0 as + defined in QVideoDeviceSelectorControl_iid. +*/ + +/*! + \macro QVideoDeviceSelectorControl_iid + + \c org.qt-project.qt.videodeviceselectorcontrol/5.0 + + Defines the interface name of the QVideoDeviceSelectorControl class. + + \relates QVideoDeviceSelectorControl +*/ + +/*! + Constructs a video device selector control with the given \a parent. +*/ +QVideoDeviceSelectorControl::QVideoDeviceSelectorControl(QObject *parent) + :QMediaControl(parent) +{ +} + +/*! + Destroys a video device selector control. +*/ +QVideoDeviceSelectorControl::~QVideoDeviceSelectorControl() +{ +} + +/*! + \fn QVideoDeviceSelectorControl::deviceCount() const + + Returns the number of available video devices; +*/ + +/*! + \fn QVideoDeviceSelectorControl::deviceName(int index) const + + Returns the name of the video device at \a index. +*/ + +/*! + \fn QVideoDeviceSelectorControl::deviceDescription(int index) const + + Returns a description of the video device at \a index. +*/ + +/*! + \fn QVideoDeviceSelectorControl::defaultDevice() const + + Returns the index of the default video device. +*/ + +/*! + \fn QVideoDeviceSelectorControl::selectedDevice() const + + Returns the index of the selected video device. +*/ + +/*! + \fn QVideoDeviceSelectorControl::setSelectedDevice(int index) + + Sets the selected video device \a index. +*/ + +/*! + \fn QVideoDeviceSelectorControl::devicesChanged() + + Signals that the list of available video devices has changed. +*/ + +/*! + \fn QVideoDeviceSelectorControl::selectedDeviceChanged(int index) + + Signals that the selected video device \a index has changed. +*/ + +/*! + \fn QVideoDeviceSelectorControl::selectedDeviceChanged(const QString &name) + + Signals that the selected video device \a name has changed. +*/ + +#include "moc_qvideodeviceselectorcontrol.cpp" +QT_END_NAMESPACE + diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.h b/src/multimedia/controls/qvideodeviceselectorcontrol.h new file mode 100644 index 000000000..d300d183c --- /dev/null +++ b/src/multimedia/controls/qvideodeviceselectorcontrol.h @@ -0,0 +1,90 @@ +/**************************************************************************** +** +** 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 QVIDEODEVICESELECTORCONTROL_H +#define QVIDEODEVICESELECTORCONTROL_H + +#include "qmediacontrol.h" + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Multimedia) + +// Required for QDoc workaround +class QString; + +class Q_MULTIMEDIA_EXPORT QVideoDeviceSelectorControl : public QMediaControl +{ + Q_OBJECT + +public: + virtual ~QVideoDeviceSelectorControl(); + + virtual int deviceCount() const = 0; + + virtual QString deviceName(int index) const = 0; + virtual QString deviceDescription(int index) const = 0; + + virtual int defaultDevice() const = 0; + virtual int selectedDevice() const = 0; + +public Q_SLOTS: + virtual void setSelectedDevice(int index) = 0; + +Q_SIGNALS: + void selectedDeviceChanged(int index); + void selectedDeviceChanged(const QString &deviceName); + void devicesChanged(); + +protected: + QVideoDeviceSelectorControl(QObject *parent = 0); +}; + +#define QVideoDeviceSelectorControl_iid "org.qt-project.qt.videodeviceselectorcontrol/5.0" +Q_MEDIA_DECLARE_CONTROL(QVideoDeviceSelectorControl, QVideoDeviceSelectorControl_iid) + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QVIDEODEVICESELECTORCONTROL_H diff --git a/src/multimedia/controls/qvideoencodercontrol.cpp b/src/multimedia/controls/qvideoencodercontrol.cpp deleted file mode 100644 index 29f87e8ec..000000000 --- a/src/multimedia/controls/qvideoencodercontrol.cpp +++ /dev/null @@ -1,162 +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 "qvideoencodercontrol.h" -#include -#include - -QT_BEGIN_NAMESPACE - -/*! - \class QVideoEncoderControl - - \inmodule QtMultimedia - - - \ingroup multimedia_control - - \brief The QVideoEncoderControl class provides access to the settings - of a media service that performs video encoding. - - If a QMediaService supports encoding video data it will implement - QVideoEncoderControl. This control provides information about the limits - of restricted video encoder options and allows the selection of a set of - video encoder settings as specified in a QVideoEncoderSettings object. - - The functionality provided by this control is exposed to application code - through the QMediaRecorder class. - - The interface name of QVideoEncoderControl is \c org.qt-project.qt.videoencodercontrol/5.0 as - defined in QVideoEncoderControl_iid. - - \sa QMediaRecorder, QVideoEncoderSettings, QMediaService::requestControl() -*/ - -/*! - \macro QVideoEncoderControl_iid - - \c org.qt-project.qt.videoencodercontrol/5.0 - - Defines the interface name of the QVideoEncoderControl class. - - \relates QVideoEncoderControl -*/ - -/*! - Create a new video encoder control object with the given \a parent. -*/ -QVideoEncoderControl::QVideoEncoderControl(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys a video encoder control. -*/ -QVideoEncoderControl::~QVideoEncoderControl() -{ -} - -/*! - \fn QVideoEncoderControl::supportedVideoCodecs() const - - Returns the list of supported video codecs. -*/ - -/*! - \fn QVideoEncoderControl::videoCodecDescription(const QString &codec) const - - Returns a description of a video \a codec. -*/ - -/*! - \fn QVideoEncoderControl::supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = 0) const - - Returns a list of supported resolutions. - - If non null video \a settings parameter is passed, - the returned list is reduced to resolution supported with partial settings like - \l {QVideoEncoderSettings::setCodec()}{video codec} or - \l {QVideoEncoderSettings::setFrameRate()}{frame rate} applied. - - If the encoder supports arbitrary resolutions within the supported resolutions range, - *\a continuous is set to true, otherwise *\a continuous is set to false. - - \sa QVideoEncoderSettings::resolution() -*/ - -/*! - \fn QVideoEncoderControl::supportedFrameRates(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = 0) const - - Returns a list of supported frame rates. - - If non null video \a settings parameter is passed, - the returned list is reduced to frame rates supported with partial settings like - \l {QVideoEncoderSettings::setCodec()}{video codec} or - \l {QVideoEncoderSettings::setResolution()}{video resolution} applied. - - If the encoder supports arbitrary frame rates within the supported range, - *\a continuous is set to true, otherwise *\a continuous is set to false. - - \sa QVideoEncoderSettings::frameRate() -*/ - -/*! - \fn QVideoEncoderControl::videoSettings() const - - Returns the video encoder settings. - - The returned value may be different tha passed to QVideoEncoderControl::setVideoSettings() - if the settings contains the default or undefined parameters. - In this case if the undefined parameters are already resolved, they should be returned. -*/ - -/*! - \fn QVideoEncoderControl::setVideoSettings(const QVideoEncoderSettings &settings) - - Sets the selected video encoder \a settings. -*/ - -#include "moc_qvideoencodercontrol.cpp" -QT_END_NAMESPACE - diff --git a/src/multimedia/controls/qvideoencodercontrol.h b/src/multimedia/controls/qvideoencodercontrol.h deleted file mode 100644 index 4313e1a50..000000000 --- a/src/multimedia/controls/qvideoencodercontrol.h +++ /dev/null @@ -1,97 +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$ -** -****************************************************************************/ - -#ifndef QVIDEOENCODERCONTROL_H -#define QVIDEOENCODERCONTROL_H - -#include "qmediacontrol.h" -#include "qmediarecorder.h" - -#include -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Multimedia) - -class QByteArray; -class QStringList; -QT_END_NAMESPACE - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QVideoEncoderControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QVideoEncoderControl(); - - virtual QList supportedResolutions(const QVideoEncoderSettings &settings, - bool *continuous = 0) const = 0; - - virtual QList supportedFrameRates(const QVideoEncoderSettings &settings, - bool *continuous = 0) const = 0; - - virtual QStringList supportedVideoCodecs() const = 0; - virtual QString videoCodecDescription(const QString &codecName) const = 0; - - virtual QVideoEncoderSettings videoSettings() const = 0; - virtual void setVideoSettings(const QVideoEncoderSettings &settings) = 0; - -protected: - QVideoEncoderControl(QObject *parent = 0); -}; - -#define QVideoEncoderControl_iid "org.qt-project.qt.videoencodercontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QVideoEncoderControl, QVideoEncoderControl_iid) - -QT_END_NAMESPACE - -QT_END_HEADER - - -#endif diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.cpp b/src/multimedia/controls/qvideoencodersettingscontrol.cpp new file mode 100644 index 000000000..0b1f2d258 --- /dev/null +++ b/src/multimedia/controls/qvideoencodersettingscontrol.cpp @@ -0,0 +1,162 @@ +/**************************************************************************** +** +** 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 "qvideoencodersettingscontrol.h" +#include +#include + +QT_BEGIN_NAMESPACE + +/*! + \class QVideoEncoderSettingsControl + + \inmodule QtMultimedia + + + \ingroup multimedia_control + + \brief The QVideoEncoderSettingsControl class provides access to the settings + of a media service that performs video encoding. + + If a QMediaService supports encoding video data it will implement + QVideoEncoderSettingsControl. This control provides information about the limits + of restricted video encoder options and allows the selection of a set of + video encoder settings as specified in a QVideoEncoderSettings object. + + The functionality provided by this control is exposed to application code + through the QMediaRecorder class. + + The interface name of QVideoEncoderSettingsControl is \c org.qt-project.qt.videoencodersettingscontrol/5.0 as + defined in QVideoEncoderSettingsControl_iid. + + \sa QMediaRecorder, QVideoEncoderSettings, QMediaService::requestControl() +*/ + +/*! + \macro QVideoEncoderSettingsControl_iid + + \c org.qt-project.qt.videoencodersettingscontrol/5.0 + + Defines the interface name of the QVideoEncoderSettingsControl class. + + \relates QVideoEncoderSettingsControl +*/ + +/*! + Create a new video encoder settings control object with the given \a parent. +*/ +QVideoEncoderSettingsControl::QVideoEncoderSettingsControl(QObject *parent) + :QMediaControl(parent) +{ +} + +/*! + Destroys a video encoder settings control. +*/ +QVideoEncoderSettingsControl::~QVideoEncoderSettingsControl() +{ +} + +/*! + \fn QVideoEncoderSettingsControl::supportedVideoCodecs() const + + Returns the list of supported video codecs. +*/ + +/*! + \fn QVideoEncoderSettingsControl::videoCodecDescription(const QString &codec) const + + Returns a description of a video \a codec. +*/ + +/*! + \fn QVideoEncoderSettingsControl::supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), + bool *continuous = 0) const + + Returns a list of supported resolutions. + + If non null video \a settings parameter is passed, + the returned list is reduced to resolution supported with partial settings like + \l {QVideoEncoderSettings::setCodec()}{video codec} or + \l {QVideoEncoderSettings::setFrameRate()}{frame rate} applied. + + If the encoder supports arbitrary resolutions within the supported resolutions range, + *\a continuous is set to true, otherwise *\a continuous is set to false. + + \sa QVideoEncoderSettings::resolution() +*/ + +/*! + \fn QVideoEncoderSettingsControl::supportedFrameRates(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), + bool *continuous = 0) const + + Returns a list of supported frame rates. + + If non null video \a settings parameter is passed, + the returned list is reduced to frame rates supported with partial settings like + \l {QVideoEncoderSettings::setCodec()}{video codec} or + \l {QVideoEncoderSettings::setResolution()}{video resolution} applied. + + If the encoder supports arbitrary frame rates within the supported range, + *\a continuous is set to true, otherwise *\a continuous is set to false. + + \sa QVideoEncoderSettings::frameRate() +*/ + +/*! + \fn QVideoEncoderSettingsControl::videoSettings() const + + Returns the video encoder settings. + + The returned value may be different tha passed to QVideoEncoderSettingsControl::setVideoSettings() + if the settings contains the default or undefined parameters. + In this case if the undefined parameters are already resolved, they should be returned. +*/ + +/*! + \fn QVideoEncoderSettingsControl::setVideoSettings(const QVideoEncoderSettings &settings) + + Sets the selected video encoder \a settings. +*/ + +#include "moc_qvideoencodersettingscontrol.cpp" +QT_END_NAMESPACE + diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.h b/src/multimedia/controls/qvideoencodersettingscontrol.h new file mode 100644 index 000000000..bdd707a37 --- /dev/null +++ b/src/multimedia/controls/qvideoencodersettingscontrol.h @@ -0,0 +1,97 @@ +/**************************************************************************** +** +** 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 QVIDEOENCODERSETTINGSCONTROL_H +#define QVIDEOENCODERSETTINGSCONTROL_H + +#include "qmediacontrol.h" +#include "qmediarecorder.h" + +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Multimedia) + +class QByteArray; +class QStringList; +QT_END_NAMESPACE + +QT_BEGIN_NAMESPACE + +// Required for QDoc workaround +class QString; + +class Q_MULTIMEDIA_EXPORT QVideoEncoderSettingsControl : public QMediaControl +{ + Q_OBJECT + +public: + virtual ~QVideoEncoderSettingsControl(); + + virtual QList supportedResolutions(const QVideoEncoderSettings &settings, + bool *continuous = 0) const = 0; + + virtual QList supportedFrameRates(const QVideoEncoderSettings &settings, + bool *continuous = 0) const = 0; + + virtual QStringList supportedVideoCodecs() const = 0; + virtual QString videoCodecDescription(const QString &codecName) const = 0; + + virtual QVideoEncoderSettings videoSettings() const = 0; + virtual void setVideoSettings(const QVideoEncoderSettings &settings) = 0; + +protected: + QVideoEncoderSettingsControl(QObject *parent = 0); +}; + +#define QVideoEncoderSettingsControl_iid "org.qt-project.qt.videoencodersettingscontrol/5.0" +Q_MEDIA_DECLARE_CONTROL(QVideoEncoderSettingsControl, QVideoEncoderSettingsControl_iid) + +QT_END_NAMESPACE + +QT_END_HEADER + + +#endif diff --git a/src/multimedia/gsttools_headers/qgstreameraudioinputendpointselector_p.h b/src/multimedia/gsttools_headers/qgstreameraudioinputendpointselector_p.h index 5d5bc715d..3828b6a66 100644 --- a/src/multimedia/gsttools_headers/qgstreameraudioinputendpointselector_p.h +++ b/src/multimedia/gsttools_headers/qgstreameraudioinputendpointselector_p.h @@ -42,12 +42,12 @@ #ifndef QGSTREAMERAUDIOINPUTENDPOINTSELECTOR_H #define QGSTREAMERAUDIOINPUTENDPOINTSELECTOR_H -#include +#include #include QT_BEGIN_NAMESPACE -class QGstreamerAudioInputEndpointSelector : public QAudioEndpointSelector +class QGstreamerAudioInputEndpointSelector : public QAudioEndpointSelectorControl { Q_OBJECT public: diff --git a/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h b/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h index f51a9c82f..bd07c97b1 100644 --- a/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h +++ b/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h @@ -42,12 +42,12 @@ #ifndef QGSTREAMERVIDEOINPUTDEVICECONTROL_H #define QGSTREAMERVIDEOINPUTDEVICECONTROL_H -#include +#include #include QT_BEGIN_NAMESPACE -class QGstreamerVideoInputDeviceControl : public QVideoDeviceControl +class QGstreamerVideoInputDeviceControl : public QVideoDeviceSelectorControl { Q_OBJECT public: diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h index ea8003754..cc22ac515 100644 --- a/src/multimedia/qmediaserviceproviderplugin.h +++ b/src/multimedia/qmediaserviceproviderplugin.h @@ -190,7 +190,7 @@ public: Required Controls: QAudioDeviceControl Recording Controls (QMediaRecorder): Required: QMediaRecorderControl - Recommended: QAudioEncoderControl + Recommended: QAudioEncoderSettingsControl Optional: QMediaContainerControl */ #define Q_MEDIASERVICE_AUDIOSOURCE "org.qt-project.qt.audiosource" @@ -202,7 +202,7 @@ public: Still Capture Controls: QCameraImageCaptureControl Video Capture Controls (QMediaRecorder): Required: QMediaRecorderControl - Recommended: QAudioEncoderControl, QVideoEncoderControl, QMediaContainerControl + Recommended: QAudioEncoderSettingsControl, QVideoEncoderSettingsControl, QMediaContainerControl Viewfinder Video Output Controls (used by QCameraViewfinder and QGraphicsVideoItem): Required: QVideoOutputControl Optional: QVideoWindowControl, QVideoRendererControl, QVideoWidgetControl @@ -214,7 +214,7 @@ public: Required Controls: QRadioTunerControl Recording Controls (Optional, used by QMediaRecorder): Required: QMediaRecorderControl - Recommended: QAudioEncoderControl + Recommended: QAudioEncoderSettingsControl Optional: QMediaContainerControl */ #define Q_MEDIASERVICE_RADIO "org.qt-project.qt.radio" diff --git a/src/multimedia/recording/qaudiorecorder.cpp b/src/multimedia/recording/qaudiorecorder.cpp index 0e965d4a9..286151194 100644 --- a/src/multimedia/recording/qaudiorecorder.cpp +++ b/src/multimedia/recording/qaudiorecorder.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qaudiorecorder.h" -#include "qaudioendpointselector.h" +#include "qaudioendpointselectorcontrol.h" #include "qmediaobject_p.h" #include "qmediarecorder_p.h" #include @@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE The \l {audiorecorder}{Audio Recorder} example shows how to use this class in more detail. - \sa QMediaRecorder, QAudioEndpointSelector + \sa QMediaRecorder, QAudioEndpointSelectorControl */ class QAudioRecorderObject : public QMediaObject @@ -105,7 +105,7 @@ public: QMediaService *service = mediaObject ? mediaObject->service() : 0; if (service != 0) - audioEndpointSelector = qobject_cast(service->requestControl(QAudioEndpointSelector_iid)); + audioEndpointSelector = qobject_cast(service->requestControl(QAudioEndpointSelectorControl_iid)); if (audioEndpointSelector) { q->connect(audioEndpointSelector, SIGNAL(activeEndpointChanged(QString)), @@ -121,7 +121,7 @@ public: audioEndpointSelector(0) {} QMediaServiceProvider *provider; - QAudioEndpointSelector *audioEndpointSelector; + QAudioEndpointSelectorControl *audioEndpointSelector; }; diff --git a/src/multimedia/recording/qmediaencodersettings.cpp b/src/multimedia/recording/qmediaencodersettings.cpp index 5d06c3bbf..1c7cc35bb 100644 --- a/src/multimedia/recording/qmediaencodersettings.cpp +++ b/src/multimedia/recording/qmediaencodersettings.cpp @@ -113,7 +113,7 @@ private: \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio encoder settings - \sa QMediaRecorder, QAudioEncoderControl + \sa QMediaRecorder, QAudioEncoderSettingsControl */ /*! @@ -427,7 +427,7 @@ private: \snippet doc/src/snippets/multimedia-snippets/media.cpp Video encoder settings - \sa QMediaRecorder, QVideoEncoderControl + \sa QMediaRecorder, QVideoEncoderSettingsControl */ /*! diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index a212abdc1..08df4f968 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -47,8 +47,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -350,8 +350,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) if (d->control) { d->formatControl = qobject_cast(service->requestControl(QMediaContainerControl_iid)); - d->audioControl = qobject_cast(service->requestControl(QAudioEncoderControl_iid)); - d->videoControl = qobject_cast(service->requestControl(QVideoEncoderControl_iid)); + d->audioControl = qobject_cast(service->requestControl(QAudioEncoderSettingsControl_iid)); + d->videoControl = qobject_cast(service->requestControl(QVideoEncoderSettingsControl_iid)); QMediaControl *control = service->requestControl(QMetaDataWriterControl_iid); if (control) { diff --git a/src/multimedia/recording/qmediarecorder_p.h b/src/multimedia/recording/qmediarecorder_p.h index 03919ef19..56922c4b8 100644 --- a/src/multimedia/recording/qmediarecorder_p.h +++ b/src/multimedia/recording/qmediarecorder_p.h @@ -50,8 +50,8 @@ QT_BEGIN_NAMESPACE class QMediaRecorderControl; class QMediaContainerControl; -class QAudioEncoderControl; -class QVideoEncoderControl; +class QAudioEncoderSettingsControl; +class QVideoEncoderSettingsControl; class QMetaDataWriterControl; class QMediaAvailabilityControl; class QTimer; @@ -71,8 +71,8 @@ public: QMediaRecorderControl *control; QMediaContainerControl *formatControl; - QAudioEncoderControl *audioControl; - QVideoEncoderControl *videoControl; + QAudioEncoderSettingsControl *audioControl; + QVideoEncoderSettingsControl *videoControl; QMetaDataWriterControl *metaDataControl; QMediaAvailabilityControl *availabilityControl; diff --git a/src/multimediawidgets/qcameraviewfinder.cpp b/src/multimediawidgets/qcameraviewfinder.cpp index 341bd79f0..6b6b74a4f 100644 --- a/src/multimediawidgets/qcameraviewfinder.cpp +++ b/src/multimediawidgets/qcameraviewfinder.cpp @@ -43,7 +43,7 @@ #include "qvideowidget_p.h" #include -#include +#include #include #include diff --git a/src/plugins/audiocapture/audiocaptureservice.cpp b/src/plugins/audiocapture/audiocaptureservice.cpp index d1d8b8290..ed5908803 100644 --- a/src/plugins/audiocapture/audiocaptureservice.cpp +++ b/src/plugins/audiocapture/audiocaptureservice.cpp @@ -70,10 +70,10 @@ QMediaControl *AudioCaptureService::requestControl(const char *name) if (qstrcmp(name,QMediaRecorderControl_iid) == 0) return m_mediaControl; - if (qstrcmp(name,QAudioEncoderControl_iid) == 0) + if (qstrcmp(name,QAudioEncoderSettingsControl_iid) == 0) return m_encoderControl; - if (qstrcmp(name,QAudioEndpointSelector_iid) == 0) + if (qstrcmp(name,QAudioEndpointSelectorControl_iid) == 0) return m_endpointSelector; if (qstrcmp(name,QMediaContainerControl_iid) == 0) diff --git a/src/plugins/audiocapture/audioencodercontrol.cpp b/src/plugins/audiocapture/audioencodercontrol.cpp index 67d685a9b..b6dc98bec 100644 --- a/src/plugins/audiocapture/audioencodercontrol.cpp +++ b/src/plugins/audiocapture/audioencodercontrol.cpp @@ -47,7 +47,7 @@ #include AudioEncoderControl::AudioEncoderControl(QObject *parent) - :QAudioEncoderControl(parent) + :QAudioEncoderSettingsControl(parent) { m_session = qobject_cast(parent); diff --git a/src/plugins/audiocapture/audioencodercontrol.h b/src/plugins/audiocapture/audioencodercontrol.h index bf7e7b327..e516be6a3 100644 --- a/src/plugins/audiocapture/audioencodercontrol.h +++ b/src/plugins/audiocapture/audioencodercontrol.h @@ -42,7 +42,7 @@ #ifndef AUDIOENCODERCONTROL_H #define AUDIOENCODERCONTROL_H -#include "qaudioencodercontrol.h" +#include "qaudioencodersettingscontrol.h" #include #include @@ -53,7 +53,7 @@ class AudioCaptureSession; QT_USE_NAMESPACE -class AudioEncoderControl : public QAudioEncoderControl +class AudioEncoderControl : public QAudioEncoderSettingsControl { Q_OBJECT public: diff --git a/src/plugins/audiocapture/audioendpointselector.cpp b/src/plugins/audiocapture/audioendpointselector.cpp index f9eb8fa4f..757d779bd 100644 --- a/src/plugins/audiocapture/audioendpointselector.cpp +++ b/src/plugins/audiocapture/audioendpointselector.cpp @@ -46,7 +46,7 @@ AudioEndpointSelector::AudioEndpointSelector(QObject *parent) - :QAudioEndpointSelector(parent) + :QAudioEndpointSelectorControl(parent) { m_session = qobject_cast(parent); diff --git a/src/plugins/audiocapture/audioendpointselector.h b/src/plugins/audiocapture/audioendpointselector.h index e4d1a0940..9eb34eda4 100644 --- a/src/plugins/audiocapture/audioendpointselector.h +++ b/src/plugins/audiocapture/audioendpointselector.h @@ -44,13 +44,13 @@ #include -#include "qaudioendpointselector.h" +#include "qaudioendpointselectorcontrol.h" class AudioCaptureSession; QT_USE_NAMESPACE -class AudioEndpointSelector : public QAudioEndpointSelector +class AudioEndpointSelector : public QAudioEndpointSelectorControl { Q_OBJECT public: diff --git a/src/plugins/directshow/camera/dscameraservice.cpp b/src/plugins/directshow/camera/dscameraservice.cpp index d3467c087..d63e96759 100644 --- a/src/plugins/directshow/camera/dscameraservice.cpp +++ b/src/plugins/directshow/camera/dscameraservice.cpp @@ -111,7 +111,7 @@ QMediaControl* DSCameraService::requestControl(const char *name) if(qstrcmp(name,QVideoRendererControl_iid) == 0) return m_videoRenderer; - if(qstrcmp(name,QVideoDeviceControl_iid) == 0) + if (qstrcmp(name,QVideoDeviceSelectorControl_iid) == 0) return m_videoDevice; return 0; diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp index 5f2e91b4f..94b070416 100644 --- a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp +++ b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp @@ -57,7 +57,7 @@ extern const CLSID CLSID_VideoInputDeviceCategory; QT_BEGIN_NAMESPACE DSVideoDeviceControl::DSVideoDeviceControl(QObject *parent) - : QVideoDeviceControl(parent) + : QVideoDeviceSelectorControl(parent) { m_session = qobject_cast(parent); diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.h b/src/plugins/directshow/camera/dsvideodevicecontrol.h index 3fb7d3fc1..7dbf24827 100644 --- a/src/plugins/directshow/camera/dsvideodevicecontrol.h +++ b/src/plugins/directshow/camera/dsvideodevicecontrol.h @@ -42,7 +42,7 @@ #ifndef DSVIDEODEVICECONTROL_H #define DSVIDEODEVICECONTROL_H -#include +#include QT_BEGIN_HEADER @@ -51,7 +51,7 @@ class DSCameraSession; //QTM_USE_NAMESPACE -class DSVideoDeviceControl : public QVideoDeviceControl +class DSVideoDeviceControl : public QVideoDeviceSelectorControl { Q_OBJECT public: diff --git a/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp b/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp index 0583b8d3e..31bc995a2 100644 --- a/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp +++ b/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp @@ -46,7 +46,7 @@ DirectShowAudioEndpointControl::DirectShowAudioEndpointControl( DirectShowPlayerService *service, QObject *parent) - : QAudioEndpointSelector(parent) + : QAudioEndpointSelectorControl(parent) , m_service(service) , m_bindContext(0) , m_deviceEnumerator(0) diff --git a/src/plugins/directshow/player/directshowaudioendpointcontrol.h b/src/plugins/directshow/player/directshowaudioendpointcontrol.h index 90e44a04e..17863fd6b 100644 --- a/src/plugins/directshow/player/directshowaudioendpointcontrol.h +++ b/src/plugins/directshow/player/directshowaudioendpointcontrol.h @@ -42,7 +42,7 @@ #ifndef DIRECTSHOWAUDIOENDPOINTCONTROL_H #define DIRECTSHOWAUDIOENDPOINTCONTROL_H -#include "qaudioendpointselector.h" +#include "qaudioendpointselectorcontrol.h" #include @@ -50,7 +50,7 @@ class DirectShowPlayerService; QT_USE_NAMESPACE -class DirectShowAudioEndpointControl : public QAudioEndpointSelector +class DirectShowAudioEndpointControl : public QAudioEndpointSelectorControl { Q_OBJECT public: diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index 2d9a5dd76..ef6c66c3b 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -156,7 +156,7 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name) { if (qstrcmp(name, QMediaPlayerControl_iid) == 0) { return m_playerControl; - } else if (qstrcmp(name, QAudioEndpointSelector_iid) == 0) { + } else if (qstrcmp(name, QAudioEndpointSelectorControl_iid) == 0) { return m_audioEndpointControl; } else if (qstrcmp(name, QMetaDataReaderControl_iid) == 0) { return m_metaDataControl; diff --git a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp index 72fe602ec..546f1aaaa 100644 --- a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp @@ -46,7 +46,7 @@ #include CameraBinAudioEncoder::CameraBinAudioEncoder(QObject *parent) - :QAudioEncoderControl(parent), + :QAudioEncoderSettingsControl(parent), m_codecs(QGstCodecsInfo::AudioEncoder) { } diff --git a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h index 4727e1327..f8dd34273 100644 --- a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h +++ b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h @@ -42,7 +42,7 @@ #ifndef CAMERABINAUDIOENCODE_H #define CAMERABINAUDIOENCODE_H -#include +#include class CameraBinSession; #include @@ -58,7 +58,7 @@ class CameraBinSession; QT_USE_NAMESPACE -class CameraBinAudioEncoder : public QAudioEncoderControl +class CameraBinAudioEncoder : public QAudioEncoderSettingsControl { Q_OBJECT public: diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.cpp b/src/plugins/gstreamer/camerabin/camerabinservice.cpp index 28b666d1e..5c58ea37c 100644 --- a/src/plugins/gstreamer/camerabin/camerabinservice.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinservice.cpp @@ -177,19 +177,19 @@ QMediaControl *CameraBinService::requestControl(const char *name) } } - if (qstrcmp(name,QAudioEndpointSelector_iid) == 0) + if (qstrcmp(name,QAudioEndpointSelectorControl_iid) == 0) return m_audioInputEndpointSelector; - if (qstrcmp(name,QVideoDeviceControl_iid) == 0) + if (qstrcmp(name,QVideoDeviceSelectorControl_iid) == 0) return m_videoInputDevice; if (qstrcmp(name,QMediaRecorderControl_iid) == 0) return m_captureSession->recorderControl(); - if (qstrcmp(name,QAudioEncoderControl_iid) == 0) + if (qstrcmp(name,QAudioEncoderSettingsControl_iid) == 0) return m_captureSession->audioEncodeControl(); - if (qstrcmp(name,QVideoEncoderControl_iid) == 0) + if (qstrcmp(name,QVideoEncoderSettingsControl_iid) == 0) return m_captureSession->videoEncodeControl(); if (qstrcmp(name,QImageEncoderControl_iid) == 0) diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.h b/src/plugins/gstreamer/camerabin/camerabinservice.h index d95d6ea42..940ec70c7 100644 --- a/src/plugins/gstreamer/camerabin/camerabinservice.h +++ b/src/plugins/gstreamer/camerabin/camerabinservice.h @@ -46,8 +46,8 @@ #include QT_BEGIN_NAMESPACE -class QAudioEndpointSelector; -class QVideoDeviceControl; +class QAudioEndpointSelectorControl; +class QVideoDeviceSelectorControl; QT_END_NAMESPACE class CameraBinSession; @@ -82,8 +82,8 @@ private: CameraBinControl *m_cameraControl; CameraBinMetaData *m_metaDataControl; - QAudioEndpointSelector *m_audioInputEndpointSelector; - QVideoDeviceControl *m_videoInputDevice; + QAudioEndpointSelectorControl *m_audioInputEndpointSelector; + QVideoDeviceSelectorControl *m_videoInputDevice; QMediaControl *m_videoOutput; diff --git a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp index e16379275..c7bb47c55 100644 --- a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp @@ -46,7 +46,7 @@ #include CameraBinVideoEncoder::CameraBinVideoEncoder(CameraBinSession *session) - :QVideoEncoderControl(session), + :QVideoEncoderSettingsControl(session), m_session(session), m_codecs(QGstCodecsInfo::VideoEncoder) { diff --git a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h index 9617731a5..554e443f0 100644 --- a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h +++ b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h @@ -42,7 +42,7 @@ #ifndef CAMERABINVIDEOENCODE_H #define CAMERABINVIDEOENCODE_H -#include +#include class CameraBinSession; #include @@ -56,7 +56,7 @@ class CameraBinSession; QT_USE_NAMESPACE -class CameraBinVideoEncoder : public QVideoEncoderControl +class CameraBinVideoEncoder : public QVideoEncoderSettingsControl { Q_OBJECT public: diff --git a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp index 5e17ba1e5..a71146c91 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp @@ -48,7 +48,7 @@ #include QGstreamerAudioEncode::QGstreamerAudioEncode(QObject *parent) - :QAudioEncoderControl(parent) + :QAudioEncoderSettingsControl(parent) { QList codecCandidates; diff --git a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h index b8fce27bb..d45c4e140 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h +++ b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h @@ -42,7 +42,7 @@ #ifndef QGSTREAMERAUDIOENCODE_H #define QGSTREAMERAUDIOENCODE_H -#include +#include #include #include @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE class QGstreamerCaptureSession; -class QGstreamerAudioEncode : public QAudioEncoderControl +class QGstreamerAudioEncode : public QAudioEncoderSettingsControl { Q_OBJECT public: diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp index bacc9c9ca..61c4e3d46 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp @@ -132,19 +132,19 @@ QMediaControl *QGstreamerCaptureService::requestControl(const char *name) if (!m_captureSession) return 0; - if (qstrcmp(name,QAudioEndpointSelector_iid) == 0) + if (qstrcmp(name,QAudioEndpointSelectorControl_iid) == 0) return m_audioInputEndpointSelector; - if (qstrcmp(name,QVideoDeviceControl_iid) == 0) + if (qstrcmp(name,QVideoDeviceSelectorControl_iid) == 0) return m_videoInputDevice; if (qstrcmp(name,QMediaRecorderControl_iid) == 0) return m_captureSession->recorderControl(); - if (qstrcmp(name,QAudioEncoderControl_iid) == 0) + if (qstrcmp(name,QAudioEncoderSettingsControl_iid) == 0) return m_captureSession->audioEncodeControl(); - if (qstrcmp(name,QVideoEncoderControl_iid) == 0) + if (qstrcmp(name,QVideoEncoderSettingsControl_iid) == 0) return m_captureSession->videoEncodeControl(); if (qstrcmp(name,QImageEncoderControl_iid) == 0) diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h index 80445e452..d491cb823 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h @@ -48,8 +48,8 @@ #include QT_BEGIN_NAMESPACE -class QAudioEndpointSelector; -class QVideoDeviceControl; +class QAudioEndpointSelectorControl; +class QVideoDeviceSelectorControl; class QGstreamerCaptureSession; class QGstreamerCameraControl; @@ -82,8 +82,8 @@ private: QGstreamerV4L2Input *m_videoInput; QGstreamerCaptureMetaDataControl *m_metaDataControl; - QAudioEndpointSelector *m_audioInputEndpointSelector; - QVideoDeviceControl *m_videoInputDevice; + QAudioEndpointSelectorControl *m_audioInputEndpointSelector; + QVideoDeviceSelectorControl *m_videoInputDevice; QMediaControl *m_videoOutput; diff --git a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp index 67cfd38d8..2d7c75c2b 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp @@ -48,7 +48,7 @@ #include QGstreamerVideoEncode::QGstreamerVideoEncode(QGstreamerCaptureSession *session) - :QVideoEncoderControl(session), m_session(session) + :QVideoEncoderSettingsControl(session), m_session(session) { QList codecCandidates; codecCandidates << "video/h264" << "video/xvid" << "video/mpeg4" << "video/mpeg1" << "video/mpeg2" << "video/theora"; diff --git a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h index b5ba233a3..350a8a256 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h @@ -42,7 +42,7 @@ #ifndef QGSTREAMERVIDEOENCODE_H #define QGSTREAMERVIDEOENCODE_H -#include +#include #include #include @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QGstreamerCaptureSession; -class QGstreamerVideoEncode : public QVideoEncoderControl +class QGstreamerVideoEncode : public QVideoEncoderSettingsControl { Q_OBJECT public: diff --git a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp b/src/plugins/wmf/player/mfaudioendpointcontrol.cpp index d0ed93b79..ce4019c96 100644 --- a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp +++ b/src/plugins/wmf/player/mfaudioendpointcontrol.cpp @@ -43,7 +43,7 @@ #include "mfaudioendpointcontrol.h" MFAudioEndpointControl::MFAudioEndpointControl(QObject *parent) - : QAudioEndpointSelector(parent) + : QAudioEndpointSelectorControl(parent) , m_currentActivate(0) { updateEndpoints(); diff --git a/src/plugins/wmf/player/mfaudioendpointcontrol.h b/src/plugins/wmf/player/mfaudioendpointcontrol.h index dcbf1e92a..36d91f665 100644 --- a/src/plugins/wmf/player/mfaudioendpointcontrol.h +++ b/src/plugins/wmf/player/mfaudioendpointcontrol.h @@ -46,13 +46,13 @@ #include #include -#include "qaudioendpointselector.h" +#include "qaudioendpointselectorcontrol.h" class MFPlayerService; QT_USE_NAMESPACE -class MFAudioEndpointControl : public QAudioEndpointSelector +class MFAudioEndpointControl : public QAudioEndpointSelectorControl { Q_OBJECT public: diff --git a/src/plugins/wmf/player/mfplayerservice.cpp b/src/plugins/wmf/player/mfplayerservice.cpp index c4c3fbda6..20e056108 100644 --- a/src/plugins/wmf/player/mfplayerservice.cpp +++ b/src/plugins/wmf/player/mfplayerservice.cpp @@ -97,7 +97,7 @@ QMediaControl* MFPlayerService::requestControl(const char *name) { if (qstrcmp(name, QMediaPlayerControl_iid) == 0) { return m_player; - } else if (qstrcmp(name, QAudioEndpointSelector_iid) == 0) { + } else if (qstrcmp(name, QAudioEndpointSelectorControl_iid) == 0) { return m_audioEndpointControl; } else if (qstrcmp(name, QMetaDataReaderControl_iid) == 0) { return m_metaDataControl; -- cgit v1.2.3