diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-12-19 20:08:58 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-02-26 15:56:27 +0000 |
commit | 5a0a3791a1e5e97612ee11833aa084ae76a8b725 (patch) | |
tree | 08bf3f49ed0f7c999bd0bf79ead239cae5a521c3 /src/plugins/directshow/camera/dscameraservice.cpp | |
parent | 4e07ff99f6ed49da3853c3f34cce393820105f1c (diff) |
DirectShow: implemented QCameraViewfinderSettingsControl2.
Change-Id: I42ed49676e2fbc7207d8fe4579ad1fc0d62df138
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/plugins/directshow/camera/dscameraservice.cpp')
-rw-r--r-- | src/plugins/directshow/camera/dscameraservice.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/directshow/camera/dscameraservice.cpp b/src/plugins/directshow/camera/dscameraservice.cpp index a7072ed13..9fcd4de70 100644 --- a/src/plugins/directshow/camera/dscameraservice.cpp +++ b/src/plugins/directshow/camera/dscameraservice.cpp @@ -40,6 +40,7 @@ #include "dsvideorenderer.h" #include "dsvideodevicecontrol.h" #include "dsimagecapturecontrol.h" +#include "dscameraviewfindersettingscontrol.h" QT_BEGIN_NAMESPACE @@ -51,11 +52,13 @@ DSCameraService::DSCameraService(QObject *parent): m_control = new DSCameraControl(m_session); m_videoDevice = new DSVideoDeviceControl(m_session); m_imageCapture = new DSImageCaptureControl(m_session); + m_viewfinderSettings = new DSCameraViewfinderSettingsControl(m_session); } DSCameraService::~DSCameraService() { delete m_control; + delete m_viewfinderSettings; delete m_videoDevice; delete m_videoRenderer; delete m_imageCapture; @@ -80,6 +83,9 @@ QMediaControl* DSCameraService::requestControl(const char *name) if (qstrcmp(name,QVideoDeviceSelectorControl_iid) == 0) return m_videoDevice; + if (qstrcmp(name, QCameraViewfinderSettingsControl2_iid) == 0) + return m_viewfinderSettings; + return 0; } |