diff options
Diffstat (limited to 'src/plugins/gstreamer')
12 files changed, 28 insertions, 28 deletions
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: |