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/gsttools | |
parent | b834fe032f6504ec07f80332d1e22de0b4fc64e0 (diff) |
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/gsttools')
-rw-r--r-- | src/gsttools/qgstreameraudioinputendpointselector.cpp | 2 | ||||
-rw-r--r-- | src/gsttools/qgstreamervideoinputdevicecontrol.cpp | 2 |
2 files changed, 2 insertions, 2 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(); } |