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/multimedia/gsttools_headers | |
| 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/multimedia/gsttools_headers')
| -rw-r--r-- | src/multimedia/gsttools_headers/qgstreameraudioinputendpointselector_p.h | 4 | ||||
| -rw-r--r-- | src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h | 4 |
2 files changed, 4 insertions, 4 deletions
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: |