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/directshow/camera | |
| 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/plugins/directshow/camera')
| -rw-r--r-- | src/plugins/directshow/camera/dscameraservice.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/directshow/camera/dsvideodevicecontrol.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/directshow/camera/dsvideodevicecontrol.h | 4 |
3 files changed, 4 insertions, 4 deletions
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: |