diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-12-22 09:47:23 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-21 11:21:05 +0000 |
| commit | 652cd926157c8738f896b6e04aac690283f6a8df (patch) | |
| tree | 0be962ce9e66f1c57dc8321b5138c42f20506365 /src/plugins/gstreamer/camerabin/camerabinsession.cpp | |
| parent | bab71b4834d27d018c2d45b592d16f56fcbb7bbe (diff) | |
Merge QCameraFlashControl into QCameraExposureControl
They are exposwed through one class on the front-end side,
no need to complicate the API with several interfaces on
the backend side.
Change-Id: I4ecdc96edf71353f1b6d31cab92b7df064033e9a
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinsession.cpp')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index a48799dd2..8fd0d3fba 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp @@ -48,7 +48,6 @@ #if QT_CONFIG(gstreamer_photography) #include "camerabinexposure.h" -#include "camerabinflash.h" #include "camerabinfocus.h" #include "camerabinlocks.h" #endif @@ -132,7 +131,6 @@ CameraBinSession::CameraBinSession(GstElementFactory *sourceFactory, QObject *pa m_viewfinderInterface(0), #if QT_CONFIG(gstreamer_photography) m_cameraExposureControl(0), - m_cameraFlashControl(0), m_cameraFocusControl(0), m_cameraLocksControl(0), #endif @@ -238,13 +236,6 @@ CameraBinExposure *CameraBinSession::cameraExposureControl() return m_cameraExposureControl; } -CameraBinFlash *CameraBinSession::cameraFlashControl() -{ - if (!m_cameraFlashControl && photography()) - m_cameraFlashControl = new CameraBinFlash(this); - return m_cameraFlashControl; -} - CameraBinFocus *CameraBinSession::cameraFocusControl() { if (!m_cameraFocusControl && photography()) |