diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-20 16:04:57 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 02:47:29 +0200 |
commit | bba28afe559837321a2083b3ce046ab774a7ef6b (patch) | |
tree | 8908febff01fa8cfbe889dcde87e425b00fbf0d8 /src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp | |
parent | b834fe032f6504ec07f80332d1e22de0b4fc64e0 (diff) | |
download | qtmultimedia-bba28afe559837321a2083b3ce046ab774a7ef6b.tar.gz |
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 <thomas.mcguire@kdab.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp')
-rw-r--r-- | src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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) |