diff options
60 files changed, 247 insertions, 247 deletions
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 <linux/videodev2.h> 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 <qmediarecordercontrol.h> #include <qcameraimageprocessingcontrol.h> #include <qcameraimagecapturecontrol.h> -#include <qvideodevicecontrol.h> +#include <qvideodeviceselectorcontrol.h> #include <QDebug> @@ -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<QCameraControl *>(service->requestControl(QCameraControl_iid)); locksControl = qobject_cast<QCameraLocksControl *>(service->requestControl(QCameraLocksControl_iid)); - deviceControl = qobject_cast<QVideoDeviceControl*>(service->requestControl(QVideoDeviceControl_iid)); + deviceControl = qobject_cast<QVideoDeviceSelectorControl*>(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 <qcamerazoomcontrol.h> #include <qmediarecordercontrol.h> #include <qcameraimagecapturecontrol.h> -#include <qvideodevicecontrol.h> +#include <qvideodeviceselectorcontrol.h> #include <QtCore/QDebug> 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 <qmediarecordercontrol.h> #include <qcameraimageprocessingcontrol.h> #include <qcameraimagecapturecontrol.h> -#include <qvideodevicecontrol.h> +#include <qvideodeviceselectorcontrol.h> #include <QtCore/QDebug> 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/qaudioencodersettingscontrol.cpp index 92f9e350d..73f2379fa 100644 --- a/src/multimedia/controls/qaudioencodercontrol.cpp +++ b/src/multimedia/controls/qaudioencodersettingscontrol.cpp @@ -39,74 +39,74 @@ ** ****************************************************************************/ -#include "qaudioencodercontrol.h" +#include "qaudioencodersettingscontrol.h" #include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE /*! - \class QAudioEncoderControl + \class QAudioEncoderSettingsControl \inmodule QtMultimedia \ingroup multimedia_control - \brief The QAudioEncoderControl class provides access to the settings of a + \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 - QAudioEncoderControl. This control provides information about the limits + 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 QAudioEncoderControl is \c org.qt-project.qt.audioencodercontrol/5.0 as - defined in QAudioEncoderControl_iid. + The interface name of QAudioEncoderSettingsControl is \c org.qt-project.qt.audioencodersettingscontrol/5.0 as + defined in QAudioEncoderSettingsControl_iid. \sa QMediaService::requestControl(), QMediaRecorder */ /*! - \macro QAudioEncoderControl_iid + \macro QAudioEncoderSettingsControl_iid - \c org.qt-project.qt.audioencodercontrol/5.0 + \c org.qt-project.qt.audioencodersettingscontrol/5.0 - Defines the interface name of the QAudioEncoderControl class. + Defines the interface name of the QAudioEncoderSettingsControl class. - \relates QAudioEncoderControl + \relates QAudioEncoderSettingsControl */ /*! - Create a new audio encode control object with the given \a parent. + Create a new audio encoder settings control object with the given \a parent. */ -QAudioEncoderControl::QAudioEncoderControl(QObject *parent) +QAudioEncoderSettingsControl::QAudioEncoderSettingsControl(QObject *parent) :QMediaControl(parent) { } /*! - Destroys the audio encode control. + Destroys the audio encoder settings control. */ -QAudioEncoderControl::~QAudioEncoderControl() +QAudioEncoderSettingsControl::~QAudioEncoderSettingsControl() { } /*! - \fn QAudioEncoderControl::supportedAudioCodecs() const + \fn QAudioEncoderSettingsControl::supportedAudioCodecs() const Returns the list of supported audio codec names. */ /*! - \fn QAudioEncoderControl::codecDescription(const QString &codec) const + \fn QAudioEncoderSettingsControl::codecDescription(const QString &codec) const Returns description of audio \a codec. */ /*! - \fn QAudioEncoderControl::supportedSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(), + \fn QAudioEncoderSettingsControl::supportedSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(), bool *continuous) const Returns the list of supported audio sample rates, if known. @@ -121,21 +121,21 @@ QAudioEncoderControl::~QAudioEncoderControl() */ /*! - \fn QAudioEncoderControl::audioSettings() const + \fn QAudioEncoderSettingsControl::audioSettings() const Returns the audio encoder settings. - The returned value may be different tha passed to QAudioEncoderControl::setAudioSettings() + 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 QAudioEncoderControl::setAudioSettings(const QAudioEncoderSettings &settings) + \fn QAudioEncoderSettingsControl::setAudioSettings(const QAudioEncoderSettings &settings) Sets the selected audio \a settings. */ -#include "moc_qaudioencodercontrol.cpp" +#include "moc_qaudioencodersettingscontrol.cpp" QT_END_NAMESPACE diff --git a/src/multimedia/controls/qaudioencodercontrol.h b/src/multimedia/controls/qaudioencodersettingscontrol.h index 6b81f3345..a0e0ea8eb 100644 --- a/src/multimedia/controls/qaudioencodercontrol.h +++ b/src/multimedia/controls/qaudioencodersettingscontrol.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QAUDIOENCODERCONTROL_H -#define QAUDIOENCODERCONTROL_H +#ifndef QAUDIOENCODERSETTINGSCONTROL_H +#define QAUDIOENCODERSETTINGSCONTROL_H #include "qmediacontrol.h" #include "qmediarecorder.h" @@ -62,12 +62,12 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QAudioEncoderControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QAudioEncoderSettingsControl : public QMediaControl { Q_OBJECT public: - virtual ~QAudioEncoderControl(); + virtual ~QAudioEncoderSettingsControl(); virtual QStringList supportedAudioCodecs() const = 0; virtual QString codecDescription(const QString &codecName) const = 0; @@ -79,15 +79,15 @@ public: virtual void setAudioSettings(const QAudioEncoderSettings&) = 0; protected: - QAudioEncoderControl(QObject *parent = 0); + QAudioEncoderSettingsControl(QObject *parent = 0); }; -#define QAudioEncoderControl_iid "org.qt-project.qt.audioencodercontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QAudioEncoderControl, QAudioEncoderControl_iid) +#define QAudioEncoderSettingsControl_iid "org.qt-project.qt.audioencodersettingscontrol/5.0" +Q_MEDIA_DECLARE_CONTROL(QAudioEncoderSettingsControl, QAudioEncoderSettingsControl_iid) QT_END_NAMESPACE QT_END_HEADER -#endif // QAUDIOCAPTUREPROPERTIESCONTROL_H +#endif // QAUDIOENCODERSETTINGSCONTROL_H diff --git a/src/multimedia/controls/qaudioendpointselector.cpp b/src/multimedia/controls/qaudioendpointselectorcontrol.cpp index ff5c6e8a9..096389b59 100644 --- a/src/multimedia/controls/qaudioendpointselector.cpp +++ b/src/multimedia/controls/qaudioendpointselectorcontrol.cpp @@ -39,94 +39,94 @@ ** ****************************************************************************/ -#include "qaudioendpointselector.h" +#include "qaudioendpointselectorcontrol.h" QT_BEGIN_NAMESPACE /*! - \class QAudioEndpointSelector + \class QAudioEndpointSelectorControl - \brief The QAudioEndpointSelector class provides an audio endpoint selector media control. + \brief The QAudioEndpointSelectorControl class provides an audio endpoint selector media control. \inmodule QtMultimedia \ingroup multimedia_control - The QAudioEndpointSelector class provides descriptions of the audio + 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 QAudioEndpointSelector is \c org.qt-project.qt.audioendpointselector/5.0 as - defined in QAudioEndpointSelector_iid. + The interface name of QAudioEndpointSelectorControl is \c org.qt-project.qt.audioendpointselectorcontrol/5.0 as + defined in QAudioEndpointSelectorControl_iid. \sa QMediaService::requestControl() */ /*! - \macro QAudioEndpointSelector_iid + \macro QAudioEndpointSelectorControl_iid - \c org.qt-project.qt.audioendpointselector/5.0 + \c org.qt-project.qt.audioendpointselectorcontrol/5.0 - Defines the interface name of the QAudioEndpointSelector class. + Defines the interface name of the QAudioEndpointSelectorControl class. - \relates QAudioEndpointSelector + \relates QAudioEndpointSelectorControl */ /*! - Constructs a new audio endpoint selector with the given \a parent. + Constructs a new audio endpoint selector control with the given \a parent. */ -QAudioEndpointSelector::QAudioEndpointSelector(QObject *parent) +QAudioEndpointSelectorControl::QAudioEndpointSelectorControl(QObject *parent) :QMediaControl(parent) { } /*! - Destroys an audio endpoint selector. + Destroys an audio endpoint selector control. */ -QAudioEndpointSelector::~QAudioEndpointSelector() +QAudioEndpointSelectorControl::~QAudioEndpointSelectorControl() { } /*! - \fn QList<QString> QAudioEndpointSelector::availableEndpoints() const + \fn QList<QString> QAudioEndpointSelectorControl::availableEndpoints() const Returns a list of the names of the available audio endpoints. */ /*! - \fn QString QAudioEndpointSelector::endpointDescription(const QString& name) const + \fn QString QAudioEndpointSelectorControl::endpointDescription(const QString& name) const Returns the description of the endpoint \a name. */ /*! - \fn QString QAudioEndpointSelector::defaultEndpoint() const + \fn QString QAudioEndpointSelectorControl::defaultEndpoint() const Returns the name of the default audio endpoint. */ /*! - \fn QString QAudioEndpointSelector::activeEndpoint() const + \fn QString QAudioEndpointSelectorControl::activeEndpoint() const Returns the name of the currently selected audio endpoint. */ /*! - \fn QAudioEndpointSelector::setActiveEndpoint(const QString& name) + \fn QAudioEndpointSelectorControl::setActiveEndpoint(const QString& name) Set the active audio endpoint to \a name. */ /*! - \fn QAudioEndpointSelector::activeEndpointChanged(const QString& name) + \fn QAudioEndpointSelectorControl::activeEndpointChanged(const QString& name) Signals that the audio endpoint has changed to \a name. */ /*! - \fn QAudioEndpointSelector::availableEndpointsChanged() + \fn QAudioEndpointSelectorControl::availableEndpointsChanged() Signals that list of available endpoints has changed. */ -#include "moc_qaudioendpointselector.cpp" +#include "moc_qaudioendpointselectorcontrol.cpp" QT_END_NAMESPACE diff --git a/src/multimedia/controls/qaudioendpointselector.h b/src/multimedia/controls/qaudioendpointselectorcontrol.h index 97c9f00a6..9ddc767d5 100644 --- a/src/multimedia/controls/qaudioendpointselector.h +++ b/src/multimedia/controls/qaudioendpointselectorcontrol.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QAUDIOENDPOINTSELECTOR_H -#define QAUDIOENDPOINTSELECTOR_H +#ifndef QAUDIOENDPOINTSELECTORCONTROL_H +#define QAUDIOENDPOINTSELECTORCONTROL_H #include <qaudio.h> #include <qmediacontrol.h> @@ -54,12 +54,12 @@ QT_MODULE(Multimedia) // Class forward declaration required for QDoc bug class QString; -class Q_MULTIMEDIA_EXPORT QAudioEndpointSelector : public QMediaControl +class Q_MULTIMEDIA_EXPORT QAudioEndpointSelectorControl : public QMediaControl { Q_OBJECT public: - virtual ~QAudioEndpointSelector(); + virtual ~QAudioEndpointSelectorControl(); virtual QList<QString> availableEndpoints() const = 0; virtual QString endpointDescription(const QString& name) const = 0; @@ -74,15 +74,15 @@ Q_SIGNALS: void availableEndpointsChanged(); protected: - QAudioEndpointSelector(QObject *parent = 0); + QAudioEndpointSelectorControl(QObject *parent = 0); }; -#define QAudioEndpointSelector_iid "org.qt-project.qt.audioendpointselector/5.0" -Q_MEDIA_DECLARE_CONTROL(QAudioEndpointSelector, QAudioEndpointSelector_iid) +#define QAudioEndpointSelectorControl_iid "org.qt-project.qt.audioendpointselectorcontrol/5.0" +Q_MEDIA_DECLARE_CONTROL(QAudioEndpointSelectorControl, QAudioEndpointSelectorControl_iid) QT_END_NAMESPACE QT_END_HEADER -#endif // QAUDIOENDPOINTSELECTOR_H +#endif // QAUDIOENDPOINTSELECTORCONTROL_H diff --git a/src/multimedia/controls/qvideodevicecontrol.cpp b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp index d7941e5f7..85a776f8b 100644 --- a/src/multimedia/controls/qvideodevicecontrol.cpp +++ b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp @@ -39,106 +39,106 @@ ** ****************************************************************************/ -#include "qvideodevicecontrol.h" +#include "qvideodeviceselectorcontrol.h" QT_BEGIN_NAMESPACE /*! - \class QVideoDeviceControl + \class QVideoDeviceSelectorControl - \brief The QVideoDeviceControl class provides an video device selector media control. + \brief The QVideoDeviceSelectorControl class provides an video device selector media control. \inmodule QtMultimedia \ingroup multimedia_control - The QVideoDeviceControl class provides descriptions of the video devices + 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 QVideoDeviceControl is \c org.qt-project.qt.videodevicecontrol/5.0 as - defined in QVideoDeviceControl_iid. + The interface name of QVideoDeviceSelectorControl is \c org.qt-project.qt.videodeviceselectorcontrol/5.0 as + defined in QVideoDeviceSelectorControl_iid. */ /*! - \macro QVideoDeviceControl_iid + \macro QVideoDeviceSelectorControl_iid - \c org.qt-project.qt.videodevicecontrol/5.0 + \c org.qt-project.qt.videodeviceselectorcontrol/5.0 - Defines the interface name of the QVideoDeviceControl class. + Defines the interface name of the QVideoDeviceSelectorControl class. - \relates QVideoDeviceControl + \relates QVideoDeviceSelectorControl */ /*! - Constructs a video device control with the given \a parent. + Constructs a video device selector control with the given \a parent. */ -QVideoDeviceControl::QVideoDeviceControl(QObject *parent) +QVideoDeviceSelectorControl::QVideoDeviceSelectorControl(QObject *parent) :QMediaControl(parent) { } /*! - Destroys a video device control. + Destroys a video device selector control. */ -QVideoDeviceControl::~QVideoDeviceControl() +QVideoDeviceSelectorControl::~QVideoDeviceSelectorControl() { } /*! - \fn QVideoDeviceControl::deviceCount() const + \fn QVideoDeviceSelectorControl::deviceCount() const Returns the number of available video devices; */ /*! - \fn QVideoDeviceControl::deviceName(int index) const + \fn QVideoDeviceSelectorControl::deviceName(int index) const Returns the name of the video device at \a index. */ /*! - \fn QVideoDeviceControl::deviceDescription(int index) const + \fn QVideoDeviceSelectorControl::deviceDescription(int index) const Returns a description of the video device at \a index. */ /*! - \fn QVideoDeviceControl::defaultDevice() const + \fn QVideoDeviceSelectorControl::defaultDevice() const Returns the index of the default video device. */ /*! - \fn QVideoDeviceControl::selectedDevice() const + \fn QVideoDeviceSelectorControl::selectedDevice() const Returns the index of the selected video device. */ /*! - \fn QVideoDeviceControl::setSelectedDevice(int index) + \fn QVideoDeviceSelectorControl::setSelectedDevice(int index) Sets the selected video device \a index. */ /*! - \fn QVideoDeviceControl::devicesChanged() + \fn QVideoDeviceSelectorControl::devicesChanged() Signals that the list of available video devices has changed. */ /*! - \fn QVideoDeviceControl::selectedDeviceChanged(int index) + \fn QVideoDeviceSelectorControl::selectedDeviceChanged(int index) Signals that the selected video device \a index has changed. */ /*! - \fn QVideoDeviceControl::selectedDeviceChanged(const QString &name) + \fn QVideoDeviceSelectorControl::selectedDeviceChanged(const QString &name) Signals that the selected video device \a name has changed. */ -#include "moc_qvideodevicecontrol.cpp" +#include "moc_qvideodeviceselectorcontrol.cpp" QT_END_NAMESPACE diff --git a/src/multimedia/controls/qvideodevicecontrol.h b/src/multimedia/controls/qvideodeviceselectorcontrol.h index 1ea65dc81..d300d183c 100644 --- a/src/multimedia/controls/qvideodevicecontrol.h +++ b/src/multimedia/controls/qvideodeviceselectorcontrol.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QVIDEODEVICECONTROL_H -#define QVIDEODEVICECONTROL_H +#ifndef QVIDEODEVICESELECTORCONTROL_H +#define QVIDEODEVICESELECTORCONTROL_H #include "qmediacontrol.h" @@ -53,12 +53,12 @@ QT_MODULE(Multimedia) // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QVideoDeviceControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QVideoDeviceSelectorControl : public QMediaControl { Q_OBJECT public: - virtual ~QVideoDeviceControl(); + virtual ~QVideoDeviceSelectorControl(); virtual int deviceCount() const = 0; @@ -77,14 +77,14 @@ Q_SIGNALS: void devicesChanged(); protected: - QVideoDeviceControl(QObject *parent = 0); + QVideoDeviceSelectorControl(QObject *parent = 0); }; -#define QVideoDeviceControl_iid "org.qt-project.qt.videodevicecontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QVideoDeviceControl, QVideoDeviceControl_iid) +#define QVideoDeviceSelectorControl_iid "org.qt-project.qt.videodeviceselectorcontrol/5.0" +Q_MEDIA_DECLARE_CONTROL(QVideoDeviceSelectorControl, QVideoDeviceSelectorControl_iid) QT_END_NAMESPACE QT_END_HEADER -#endif // QVIDEODEVICECONTROL_H +#endif // QVIDEODEVICESELECTORCONTROL_H diff --git a/src/multimedia/controls/qvideoencodercontrol.cpp b/src/multimedia/controls/qvideoencodersettingscontrol.cpp index 29f87e8ec..0b1f2d258 100644 --- a/src/multimedia/controls/qvideoencodercontrol.cpp +++ b/src/multimedia/controls/qvideoencodersettingscontrol.cpp @@ -39,76 +39,76 @@ ** ****************************************************************************/ -#include "qvideoencodercontrol.h" +#include "qvideoencodersettingscontrol.h" #include <QtCore/qstringlist.h> #include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE /*! - \class QVideoEncoderControl + \class QVideoEncoderSettingsControl \inmodule QtMultimedia \ingroup multimedia_control - \brief The QVideoEncoderControl class provides access to the settings + \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 - QVideoEncoderControl. This control provides information about the limits + 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 QVideoEncoderControl is \c org.qt-project.qt.videoencodercontrol/5.0 as - defined in QVideoEncoderControl_iid. + 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 QVideoEncoderControl_iid + \macro QVideoEncoderSettingsControl_iid - \c org.qt-project.qt.videoencodercontrol/5.0 + \c org.qt-project.qt.videoencodersettingscontrol/5.0 - Defines the interface name of the QVideoEncoderControl class. + Defines the interface name of the QVideoEncoderSettingsControl class. - \relates QVideoEncoderControl + \relates QVideoEncoderSettingsControl */ /*! - Create a new video encoder control object with the given \a parent. + Create a new video encoder settings control object with the given \a parent. */ -QVideoEncoderControl::QVideoEncoderControl(QObject *parent) +QVideoEncoderSettingsControl::QVideoEncoderSettingsControl(QObject *parent) :QMediaControl(parent) { } /*! - Destroys a video encoder control. + Destroys a video encoder settings control. */ -QVideoEncoderControl::~QVideoEncoderControl() +QVideoEncoderSettingsControl::~QVideoEncoderSettingsControl() { } /*! - \fn QVideoEncoderControl::supportedVideoCodecs() const + \fn QVideoEncoderSettingsControl::supportedVideoCodecs() const Returns the list of supported video codecs. */ /*! - \fn QVideoEncoderControl::videoCodecDescription(const QString &codec) const + \fn QVideoEncoderSettingsControl::videoCodecDescription(const QString &codec) const Returns a description of a video \a codec. */ /*! - \fn QVideoEncoderControl::supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), + \fn QVideoEncoderSettingsControl::supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), bool *continuous = 0) const Returns a list of supported resolutions. @@ -125,7 +125,7 @@ QVideoEncoderControl::~QVideoEncoderControl() */ /*! - \fn QVideoEncoderControl::supportedFrameRates(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), + \fn QVideoEncoderSettingsControl::supportedFrameRates(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), bool *continuous = 0) const Returns a list of supported frame rates. @@ -142,21 +142,21 @@ QVideoEncoderControl::~QVideoEncoderControl() */ /*! - \fn QVideoEncoderControl::videoSettings() const + \fn QVideoEncoderSettingsControl::videoSettings() const Returns the video encoder settings. - The returned value may be different tha passed to QVideoEncoderControl::setVideoSettings() + 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 QVideoEncoderControl::setVideoSettings(const QVideoEncoderSettings &settings) + \fn QVideoEncoderSettingsControl::setVideoSettings(const QVideoEncoderSettings &settings) Sets the selected video encoder \a settings. */ -#include "moc_qvideoencodercontrol.cpp" +#include "moc_qvideoencodersettingscontrol.cpp" QT_END_NAMESPACE diff --git a/src/multimedia/controls/qvideoencodercontrol.h b/src/multimedia/controls/qvideoencodersettingscontrol.h index 4313e1a50..bdd707a37 100644 --- a/src/multimedia/controls/qvideoencodercontrol.h +++ b/src/multimedia/controls/qvideoencodersettingscontrol.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QVIDEOENCODERCONTROL_H -#define QVIDEOENCODERCONTROL_H +#ifndef QVIDEOENCODERSETTINGSCONTROL_H +#define QVIDEOENCODERSETTINGSCONTROL_H #include "qmediacontrol.h" #include "qmediarecorder.h" @@ -63,12 +63,12 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QVideoEncoderControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QVideoEncoderSettingsControl : public QMediaControl { Q_OBJECT public: - virtual ~QVideoEncoderControl(); + virtual ~QVideoEncoderSettingsControl(); virtual QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings, bool *continuous = 0) const = 0; @@ -83,11 +83,11 @@ public: virtual void setVideoSettings(const QVideoEncoderSettings &settings) = 0; protected: - QVideoEncoderControl(QObject *parent = 0); + QVideoEncoderSettingsControl(QObject *parent = 0); }; -#define QVideoEncoderControl_iid "org.qt-project.qt.videoencodercontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QVideoEncoderControl, QVideoEncoderControl_iid) +#define QVideoEncoderSettingsControl_iid "org.qt-project.qt.videoencodersettingscontrol/5.0" +Q_MEDIA_DECLARE_CONTROL(QVideoEncoderSettingsControl, QVideoEncoderSettingsControl_iid) QT_END_NAMESPACE 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 <qaudioendpointselector.h> +#include <qaudioendpointselectorcontrol.h> #include <QtCore/qstringlist.h> 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 <qvideodevicecontrol.h> +#include <qvideodeviceselectorcontrol.h> #include <QtCore/qstringlist.h> 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 <qmediaservice.h> @@ -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<QAudioEndpointSelector*>(service->requestControl(QAudioEndpointSelector_iid)); + audioEndpointSelector = qobject_cast<QAudioEndpointSelectorControl*>(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 <qmediaservice.h> #include <qmediaserviceprovider_p.h> #include <qmetadatawritercontrol.h> -#include <qaudioencodercontrol.h> -#include <qvideoencodercontrol.h> +#include <qaudioencodersettingscontrol.h> +#include <qvideoencodersettingscontrol.h> #include <qmediacontainercontrol.h> #include <qmediaavailabilitycontrol.h> #include <qcamera.h> @@ -350,8 +350,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) if (d->control) { d->formatControl = qobject_cast<QMediaContainerControl *>(service->requestControl(QMediaContainerControl_iid)); - d->audioControl = qobject_cast<QAudioEncoderControl *>(service->requestControl(QAudioEncoderControl_iid)); - d->videoControl = qobject_cast<QVideoEncoderControl *>(service->requestControl(QVideoEncoderControl_iid)); + d->audioControl = qobject_cast<QAudioEncoderSettingsControl *>(service->requestControl(QAudioEncoderSettingsControl_iid)); + d->videoControl = qobject_cast<QVideoEncoderSettingsControl *>(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 <qcamera.h> -#include <qvideodevicecontrol.h> +#include <qvideodeviceselectorcontrol.h> #include <private/qmediaobject_p.h> #include <QtCore/QDebug> 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 <QtCore/qdebug.h> AudioEncoderControl::AudioEncoderControl(QObject *parent) - :QAudioEncoderControl(parent) + :QAudioEncoderSettingsControl(parent) { m_session = qobject_cast<AudioCaptureSession*>(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 <QtCore/qstringlist.h> #include <QtCore/qmap.h> @@ -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<AudioCaptureSession*>(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 <QStringList> -#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<DSCameraSession*>(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 <qvideodevicecontrol.h> +#include <qvideodeviceselectorcontrol.h> 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 <dshow.h> @@ -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 <QtCore/qdebug.h> 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 <qaudioencodercontrol.h> +#include <qaudioencodersettingscontrol.h> class CameraBinSession; #include <QtCore/qstringlist.h> @@ -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 <gst/gst.h> 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 <QtCore/qdebug.h> 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 <qvideoencodercontrol.h> +#include <qvideoencodersettingscontrol.h> class CameraBinSession; #include <QtCore/qstringlist.h> @@ -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 <math.h> QGstreamerAudioEncode::QGstreamerAudioEncode(QObject *parent) - :QAudioEncoderControl(parent) + :QAudioEncoderSettingsControl(parent) { QList<QByteArray> 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 <qaudioencodercontrol.h> +#include <qaudioencodersettingscontrol.h> #include <QtCore/qstringlist.h> #include <QtCore/qmap.h> @@ -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 <gst/gst.h> 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 <math.h> QGstreamerVideoEncode::QGstreamerVideoEncode(QGstreamerCaptureSession *session) - :QVideoEncoderControl(session), m_session(session) + :QVideoEncoderSettingsControl(session), m_session(session) { QList<QByteArray> 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 <qvideoencodercontrol.h> +#include <qvideoencodersettingscontrol.h> #include <QtCore/qstringlist.h> #include <QtCore/qmap.h> @@ -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 <mfidl.h> #include <mmdeviceapi.h> -#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; diff --git a/tests/auto/unit/multimedia.pro b/tests/auto/unit/multimedia.pro index f909a3b5f..309d41255 100644 --- a/tests/auto/unit/multimedia.pro +++ b/tests/auto/unit/multimedia.pro @@ -25,7 +25,7 @@ SUBDIRS += \ qmetadatawritercontrol \ qradiodata \ qradiotuner \ - qvideoencodercontrol \ + qvideoencodersettingscontrol \ qvideoframe \ qvideosurfaceformat \ qwavedecoder \ diff --git a/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp b/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp index 878b03a53..676fb6611 100644 --- a/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp +++ b/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp @@ -45,9 +45,9 @@ #include <qaudioformat.h> #include <qaudiorecorder.h> -#include <qaudioencodercontrol.h> +#include <qaudioencodersettingscontrol.h> #include <qmediarecordercontrol.h> -#include <qaudioendpointselector.h> +#include <qaudioendpointselectorcontrol.h> #include <qaudiodeviceinfo.h> #include <qaudioinput.h> #include <qmediaobject.h> diff --git a/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp b/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp index ba4d579f2..58e70e23d 100644 --- a/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp +++ b/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp @@ -48,10 +48,10 @@ #include <qmediarecordercontrol.h> #include <qmediarecorder.h> #include <qmetadatawritercontrol.h> -#include <qaudioendpointselector.h> -#include <qaudioencodercontrol.h> +#include <qaudioendpointselectorcontrol.h> +#include <qaudioencodersettingscontrol.h> #include <qmediacontainercontrol.h> -#include <qvideoencodercontrol.h> +#include <qvideoencodersettingscontrol.h> #include <qaudioformat.h> #include "mockmediacontainercontrol.h" diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index 977037dd8..f249ab2e7 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp @@ -48,7 +48,7 @@ #include <qmediaobject.h> #include <qmediaservice.h> #include <qmetadatareadercontrol.h> -#include <qaudioendpointselector.h> +#include <qaudioendpointselectorcontrol.h> #include "mockmediarecorderservice.h" #include "mockmediaserviceprovider.h" diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp index 99ea5d7b5..10409038d 100644 --- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp @@ -49,10 +49,10 @@ #include <qmediarecordercontrol.h> #include <qmediarecorder.h> #include <qmetadatawritercontrol.h> -#include <qaudioendpointselector.h> -#include <qaudioencodercontrol.h> +#include <qaudioendpointselectorcontrol.h> +#include <qaudioencodersettingscontrol.h> #include <qmediacontainercontrol.h> -#include <qvideoencodercontrol.h> +#include <qvideoencodersettingscontrol.h> #include <qaudioformat.h> #include "mockmediarecorderservice.h" @@ -114,13 +114,13 @@ private slots: void testVideoSettingsDestructor(); private: - QAudioEncoderControl* encode; - QAudioEndpointSelector* audio; + QAudioEncoderSettingsControl* encode; + QAudioEndpointSelectorControl* audio; MockMediaObject *object; MockMediaRecorderService*service; MockMediaRecorderControl *mock; QMediaRecorder *capture; - QVideoEncoderControl* videoEncode; + QVideoEncoderSettingsControl* videoEncode; }; void tst_QMediaRecorder::initTestCase() @@ -133,9 +133,9 @@ void tst_QMediaRecorder::initTestCase() object = new MockMediaObject(this, service); capture = new QMediaRecorder(object); - audio = qobject_cast<QAudioEndpointSelector*>(service->requestControl(QAudioEndpointSelector_iid)); - encode = qobject_cast<QAudioEncoderControl*>(service->requestControl(QAudioEncoderControl_iid)); - videoEncode = qobject_cast<QVideoEncoderControl*>(service->requestControl(QVideoEncoderControl_iid)); + audio = qobject_cast<QAudioEndpointSelectorControl*>(service->requestControl(QAudioEndpointSelectorControl_iid)); + encode = qobject_cast<QAudioEncoderSettingsControl*>(service->requestControl(QAudioEncoderSettingsControl_iid)); + videoEncode = qobject_cast<QVideoEncoderSettingsControl*>(service->requestControl(QVideoEncoderSettingsControl_iid)); } void tst_QMediaRecorder::cleanupTestCase() diff --git a/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp b/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp index 2b497791c..09c4ba1d5 100644 --- a/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp +++ b/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp @@ -43,7 +43,7 @@ #include <QtTest/QtTest> -#include <qvideodevicecontrol.h> +#include <qvideodeviceselectorcontrol.h> #include <qmediacontrol.h> #include <qmediaservice.h> diff --git a/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h index 7fb83e396..ffe1800b9 100644 --- a/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h @@ -42,14 +42,14 @@ #ifndef MOCKAUDIOENCODERCONTROL_H #define MOCKAUDIOENCODERCONTROL_H -#include "qaudioencodercontrol.h" +#include "qaudioencodersettingscontrol.h" -class MockAudioEncoderControl : public QAudioEncoderControl +class MockAudioEncoderControl : public QAudioEncoderSettingsControl { Q_OBJECT public: MockAudioEncoderControl(QObject *parent): - QAudioEncoderControl(parent) + QAudioEncoderSettingsControl(parent) { m_codecs << "audio/pcm" << "audio/mpeg"; m_descriptions << "Pulse Code Modulation" << "mp3 format"; diff --git a/tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h b/tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h index ef20b3a46..34b584b3f 100644 --- a/tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h +++ b/tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h @@ -42,14 +42,14 @@ #ifndef MOCKAUDIOENDPOINTSELECTOR_H #define MOCKAUDIOENDPOINTSELECTOR_H -#include "qaudioendpointselector.h" +#include "qaudioendpointselectorcontrol.h" -class MockAudioEndpointSelector : public QAudioEndpointSelector +class MockAudioEndpointSelector : public QAudioEndpointSelectorControl { Q_OBJECT public: MockAudioEndpointSelector(QObject *parent): - QAudioEndpointSelector(parent) + QAudioEndpointSelectorControl(parent) { m_names << "device1" << "device2" << "device3"; m_descriptions << "dev1 comment" << "dev2 comment" << "dev3 comment"; diff --git a/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h b/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h index f642c43a6..09218893e 100644 --- a/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h +++ b/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h @@ -73,15 +73,15 @@ public: QMediaControl* requestControl(const char *name) { - if (hasControls && qstrcmp(name,QAudioEncoderControl_iid) == 0) + if (hasControls && qstrcmp(name,QAudioEncoderSettingsControl_iid) == 0) return mockAudioEncoderControl; - if (hasControls && qstrcmp(name,QAudioEndpointSelector_iid) == 0) + if (hasControls && qstrcmp(name,QAudioEndpointSelectorControl_iid) == 0) return mockAudioEndpointSelector; if (hasControls && qstrcmp(name,QMediaRecorderControl_iid) == 0) return mockControl; if (hasControls && qstrcmp(name,QMediaContainerControl_iid) == 0) return mockFormatControl; - if (hasControls && qstrcmp(name,QVideoEncoderControl_iid) == 0) + if (hasControls && qstrcmp(name,QVideoEncoderSettingsControl_iid) == 0) return mockVideoEncoderControl; if (hasControls && qstrcmp(name, QMetaDataWriterControl_iid) == 0) return mockMetaDataControl; @@ -98,10 +98,10 @@ public: } QMediaControl *mockControl; - QAudioEndpointSelector *mockAudioEndpointSelector; - QAudioEncoderControl *mockAudioEncoderControl; + QAudioEndpointSelectorControl *mockAudioEndpointSelector; + QAudioEncoderSettingsControl *mockAudioEncoderControl; QMediaContainerControl *mockFormatControl; - QVideoEncoderControl *mockVideoEncoderControl; + QVideoEncoderSettingsControl *mockVideoEncoderControl; MockMetaDataWriterControl *mockMetaDataControl; MockAvailabilityControl *mockAvailabilityControl; MockAudioProbeControl *mockAudioProbeControl; diff --git a/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h index 1e756d389..e9f9744f1 100644 --- a/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h @@ -42,14 +42,14 @@ #ifndef MOCKVIDEOENCODERCONTROL_H #define MOCKVIDEOENCODERCONTROL_H -#include "qvideoencodercontrol.h" +#include "qvideoencodersettingscontrol.h" -class MockVideoEncoderControl : public QVideoEncoderControl +class MockVideoEncoderControl : public QVideoEncoderSettingsControl { Q_OBJECT public: MockVideoEncoderControl(QObject *parent): - QVideoEncoderControl(parent) + QVideoEncoderSettingsControl(parent) { m_videoCodecs << "video/3gpp" << "video/H264"; m_sizes << QSize(320,240) << QSize(640,480); diff --git a/tests/auto/unit/qvideoencodercontrol/qvideoencodercontrol.pro b/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro index ad14a25af..891985221 100644 --- a/tests/auto/unit/qvideoencodercontrol/qvideoencodercontrol.pro +++ b/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro @@ -1,9 +1,9 @@ CONFIG += testcase -TARGET = tst_qvideoencodercontrol +TARGET = tst_qvideoencodersettingscontrol QT += multimedia-private testlib CONFIG += no_private_qt_headers_warning SOURCES += \ - tst_qvideoencodercontrol.cpp + tst_qvideoencodersettingscontrol.cpp diff --git a/tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp b/tests/auto/unit/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp index 3df6d05fd..059f2c725 100644 --- a/tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp +++ b/tests/auto/unit/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp @@ -42,13 +42,13 @@ //TESTED_COMPONENT=src/multimedia #include <QtTest/QtTest> -#include "qvideoencodercontrol.h" -class MyVideEncoderControl: public QVideoEncoderControl +#include "qvideoencodersettingscontrol.h" +class MyVideEncoderControl: public QVideoEncoderSettingsControl { Q_OBJECT public: - MyVideEncoderControl(QObject *parent = 0 ):QVideoEncoderControl(parent) + MyVideEncoderControl(QObject *parent = 0 ):QVideoEncoderSettingsControl(parent) { } @@ -99,20 +99,20 @@ public: } }; -class tst_QVideoEncoderControl: public QObject +class tst_QVideoEncoderSettingsControl: public QObject { Q_OBJECT private slots: void constructor(); }; -void tst_QVideoEncoderControl::constructor() +void tst_QVideoEncoderSettingsControl::constructor() { QObject parent; MyVideEncoderControl control(&parent); } -QTEST_MAIN(tst_QVideoEncoderControl) -#include "tst_qvideoencodercontrol.moc" +QTEST_MAIN(tst_QVideoEncoderSettingsControl) +#include "tst_qvideoencodersettingscontrol.moc" |