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/avfoundation/camera/avfcameraflashcontrol.h | |
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/avfoundation/camera/avfcameraflashcontrol.h')
-rw-r--r-- | src/plugins/avfoundation/camera/avfcameraflashcontrol.h | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/src/plugins/avfoundation/camera/avfcameraflashcontrol.h b/src/plugins/avfoundation/camera/avfcameraflashcontrol.h deleted file mode 100644 index 58403e829..000000000 --- a/src/plugins/avfoundation/camera/avfcameraflashcontrol.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef AVFCAMERAFLASHCONTROL_H -#define AVFCAMERAFLASHCONTROL_H - -#include <QtMultimedia/qcameraflashcontrol.h> -#include <QtMultimedia/qcamera.h> - -#include <QtCore/qlist.h> - -QT_BEGIN_NAMESPACE - -class AVFCameraService; -class AVFCameraSession; - -class AVFCameraFlashControl : public QCameraFlashControl -{ - Q_OBJECT -public: - AVFCameraFlashControl(AVFCameraService *service); - - QCameraExposure::FlashModes flashMode() const override; - void setFlashMode(QCameraExposure::FlashModes mode) override; - bool isFlashModeSupported(QCameraExposure::FlashModes mode) const override; - bool isFlashReady() const override; - -private Q_SLOTS: - void cameraStateChanged(QCamera::State newState); - -private: - bool applyFlashSettings(); - - AVFCameraService *m_service; - AVFCameraSession *m_session; - - // Set of bits: - QCameraExposure::FlashModes m_supportedModes; - // Only one bit set actually: - QCameraExposure::FlashModes m_flashMode; -}; - -QT_END_NAMESPACE - - -#endif // AVFCAMERAFLASHCONTROL_H - |