diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-04-19 09:52:20 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-09-19 09:05:29 +0000 |
| commit | 0f47f44d2fc7b3fac7fdd8ee6eeafd767c43ec2e (patch) | |
| tree | fa94d84f4e8ad3f4f887d834752f4b0bf807d89e /src/plugins/winrt/qwinrtcameraservice.cpp | |
| parent | 3c893cc4ef799f987638e56ef43f1ac5cbe0c249 (diff) | |
winrt: Add QCameraFlashControl
This is without video modes so far, simply because video itself is
not supported yet.
Also included a cleanup for string conversions.
Task-number: QTBUG-48541
Change-Id: Ib090f61861596e095d597cf7e5e74f7040fbc58f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins/winrt/qwinrtcameraservice.cpp')
| -rw-r--r-- | src/plugins/winrt/qwinrtcameraservice.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/winrt/qwinrtcameraservice.cpp b/src/plugins/winrt/qwinrtcameraservice.cpp index f76edae51..d0327a708 100644 --- a/src/plugins/winrt/qwinrtcameraservice.cpp +++ b/src/plugins/winrt/qwinrtcameraservice.cpp @@ -50,6 +50,7 @@ #include <QtMultimedia/QVideoRendererControl> #include <QtMultimedia/QVideoDeviceSelectorControl> #include <QtMultimedia/QImageEncoderControl> +#include <QtMultimedia/QCameraFlashControl> #include <QtMultimedia/QCameraFocusControl> #include <QtMultimedia/QCameraLocksControl> #include <QtMultimedia/QMediaVideoProbeControl> @@ -98,6 +99,9 @@ QMediaControl *QWinRTCameraService::requestControl(const char *name) if (qstrcmp(name, QImageEncoderControl_iid) == 0) return d->cameraControl->imageEncoderControl(); + if (qstrcmp(name, QCameraFlashControl_iid) == 0) + return d->cameraControl->cameraFlashControl(); + if (qstrcmp(name, QCameraFocusControl_iid) == 0) return d->cameraControl->cameraFocusControl(); |