diff options
author | Doris Verria <doris.verria@qt.io> | 2021-02-24 18:29:56 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-03-05 12:34:22 +0000 |
commit | 967570004e2a0dde043970021c5c32312feee4ed (patch) | |
tree | f0a1fb6aa47eb9f21937a4334b2d441d80e58a4b /src/multimedia/controls | |
parent | 55928daa35a34dcd9b2e281bd449744e6bc6bad3 (diff) | |
download | qtmultimedia-967570004e2a0dde043970021c5c32312feee4ed.tar.gz |
Rename backend classes as a next step in consistent class naming
Remove the Control* naming convention of the backend classes and
rename to QPlatformFoo. Make headers private.
Change-Id: Ic7310c7a22cfcf247d823eb984c09e8a9378c9a9
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/controls')
-rw-r--r-- | src/multimedia/controls/controls.pri | 18 | ||||
-rw-r--r-- | src/multimedia/controls/qaudiodecodercontrol.cpp | 241 | ||||
-rw-r--r-- | src/multimedia/controls/qaudiodecodercontrol.h | 97 | ||||
-rw-r--r-- | src/multimedia/controls/qcameracontrol.cpp | 167 | ||||
-rw-r--r-- | src/multimedia/controls/qcameracontrol.h | 95 | ||||
-rw-r--r-- | src/multimedia/controls/qcameraexposurecontrol.cpp | 170 | ||||
-rw-r--r-- | src/multimedia/controls/qcameraexposurecontrol.h | 99 | ||||
-rw-r--r-- | src/multimedia/controls/qcamerafocuscontrol.cpp | 264 | ||||
-rw-r--r-- | src/multimedia/controls/qcamerafocuscontrol.h | 95 | ||||
-rw-r--r-- | src/multimedia/controls/qcameraimagecapturecontrol.cpp | 172 | ||||
-rw-r--r-- | src/multimedia/controls/qcameraimagecapturecontrol.h | 85 | ||||
-rw-r--r-- | src/multimedia/controls/qcameraimageprocessingcontrol.cpp | 147 | ||||
-rw-r--r-- | src/multimedia/controls/qcameraimageprocessingcontrol.h | 87 | ||||
-rw-r--r-- | src/multimedia/controls/qmediarecordercontrol.cpp | 197 | ||||
-rw-r--r-- | src/multimedia/controls/qmediarecordercontrol.h | 104 |
15 files changed, 0 insertions, 2038 deletions
diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri index 1d317c439..fb826abdc 100644 --- a/src/multimedia/controls/controls.pri +++ b/src/multimedia/controls/controls.pri @@ -2,25 +2,7 @@ INCLUDEPATH += controls PUBLIC_HEADERS += \ - controls/qaudiodecodercontrol.h \ - controls/qcameracontrol.h \ - controls/qcameraexposurecontrol.h \ - controls/qcamerafocuscontrol.h \ - controls/qcameraimagecapturecontrol.h \ - controls/qcameraimageprocessingcontrol.h \ - controls/qplatformmediaplayer_p.h \ - controls/qmediarecordercontrol.h \ - controls/qvideorenderercontrol.h \ controls/qvideowindowcontrol.h \ SOURCES += \ - controls/qcameracontrol.cpp \ - controls/qcameraexposurecontrol.cpp \ - controls/qcamerafocuscontrol.cpp \ - controls/qcameraimagecapturecontrol.cpp \ - controls/qcameraimageprocessingcontrol.cpp \ - controls/qmediaplayercontrol.cpp \ - controls/qmediarecordercontrol.cpp \ - controls/qvideorenderercontrol.cpp \ controls/qvideowindowcontrol.cpp \ - controls/qaudiodecodercontrol.cpp \ diff --git a/src/multimedia/controls/qaudiodecodercontrol.cpp b/src/multimedia/controls/qaudiodecodercontrol.cpp deleted file mode 100644 index fa3aa1e01..000000000 --- a/src/multimedia/controls/qaudiodecodercontrol.cpp +++ /dev/null @@ -1,241 +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$ -** -****************************************************************************/ - -#include "qaudiodecodercontrol.h" - -QT_BEGIN_NAMESPACE - - -/*! - \class QAudioDecoderControl - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - \brief The QAudioDecoderControl class provides access audio decoding - functionality. - - \preliminary -*/ - -/*! - Constructs a new audio decoder control with the given \a parent. -*/ -QAudioDecoderControl::QAudioDecoderControl(QObject *parent) - : QObject(parent) -{ -} - -/*! - \fn QAudioDecoderControl::state() const - - Returns the state of a player control. -*/ - -/*! - \fn QAudioDecoderControl::stateChanged(QAudioDecoder::State newState) - - Signals that the state of a player control has changed to \a newState. - - \sa state() -*/ - -/*! - \fn QAudioDecoderControl::sourceFilename() const - - Returns the current media source filename, or a null QString if none (or a device) -*/ - -/*! - \fn QAudioDecoderControl::setSourceFilename(const QString &fileName) - - Sets the current source to \a fileName. Changing the source will - stop any current decoding and discard any buffers. - - Sources are exclusive, so only one can be set. -*/ - -/*! - \fn QAudioDecoderControl::sourceDevice() const - - Returns the current media source QIODevice, or 0 if none (or a file). -*/ - -/*! - \fn QAudioDecoderControl::setSourceDevice(QIODevice *device) - - Sets the current source to \a device. Changing the source will - stop any current decoding and discard any buffers. - - Sources are exclusive, so only one can be set. -*/ - -/*! - \fn QAudioDecoderControl::start() - - Starts decoding the current media. - - If successful the player control will immediately enter the \l {QAudioDecoder::DecodingState} - {decoding} state. - - \sa state(), read() -*/ - -/*! - \fn QAudioDecoderControl::stop() - - Stops playback of the current media and discards any buffers. - - If successful the player control will immediately enter the \l {QAudioDecoder::StoppedState} - {stopped} state. -*/ - -/*! - \fn QAudioDecoderControl::error(int error, const QString &errorString) - - Signals that an \a error has occurred. The \a errorString provides a more detailed explanation. -*/ - -/*! - \fn QAudioDecoderControl::bufferAvailableChanged(bool available) - - Signals that the bufferAvailable property has changed to \a available. -*/ - -/*! - \fn QAudioDecoderControl::bufferReady() - - Signals that a new buffer is ready for reading. -*/ - -/*! - \fn QAudioDecoderControl::bufferAvailable() const - - Returns true if a buffer is available to be read, - and false otherwise. -*/ - -/*! - \fn QAudioDecoderControl::sourceChanged() - - Signals that the current source of the decoder has changed. - - \sa sourceFilename(), sourceDevice() -*/ - -/*! - \fn QAudioDecoderControl::formatChanged(const QAudioFormat &format) - - Signals that the current audio format of the decoder has changed to \a format. - - \sa audioFormat(), setAudioFormat() -*/ - -/*! - \fn void QAudioDecoderControl::finished() - - Signals that the decoding has finished successfully. - If decoding fails, error signal is emitted instead. - - \sa start(), stop(), error() -*/ - -/*! - \fn void QAudioDecoderControl::positionChanged(qint64 position) - - Signals that the current \a position of the decoder has changed. - - \sa durationChanged() -*/ - -/*! - \fn void QAudioDecoderControl::durationChanged(qint64 duration) - - Signals that the estimated \a duration of the decoded data has changed. - - \sa positionChanged() -*/ - -/*! - \fn QAudioDecoderControl::audioFormat() const - Returns the current audio format of the decoded stream. - - Any buffers returned should have this format. - - \sa setAudioFormat(), formatChanged() -*/ - -/*! - \fn QAudioDecoderControl::setAudioFormat(const QAudioFormat &format) - Set the desired audio format for decoded samples to \a format. - - If the decoder does not support this format, \l error() will - be set to \c FormatError. - - If you do not specify a format, the format of the decoded - audio itself will be used. Otherwise, some format conversion - will be applied. - - If you wish to reset the decoded format to that of the original - audio file, you can specify an invalid \a format. -*/ - -/*! - \fn QAudioDecoderControl::read() - Attempts to read a buffer from the decoder, without blocking. Returns invalid buffer if there are - no decoded buffers available, or on error. -*/ - -/*! - \fn QAudioDecoderControl::position() const - Returns position (in milliseconds) of the last buffer read from - the decoder or -1 if no buffers have been read. -*/ - -/*! - \fn QAudioDecoderControl::duration() const - Returns total duration (in milliseconds) of the audio stream - or -1 if not available. -*/ - -QT_END_NAMESPACE - -#include "moc_qaudiodecodercontrol.cpp" diff --git a/src/multimedia/controls/qaudiodecodercontrol.h b/src/multimedia/controls/qaudiodecodercontrol.h deleted file mode 100644 index b77457ce1..000000000 --- a/src/multimedia/controls/qaudiodecodercontrol.h +++ /dev/null @@ -1,97 +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 QAUDIODECODERCONTROL_H -#define QAUDIODECODERCONTROL_H - -#include <QtMultimedia/qaudiodecoder.h> - -#include <QtCore/qpair.h> - -#include <QtMultimedia/qaudiobuffer.h> - -QT_BEGIN_NAMESPACE - -class QIODevice; -class Q_MULTIMEDIA_EXPORT QAudioDecoderControl : public QObject -{ - Q_OBJECT - -public: - virtual QAudioDecoder::State state() const = 0; - - virtual QString sourceFilename() const = 0; - virtual void setSourceFilename(const QString &fileName) = 0; - - virtual QIODevice* sourceDevice() const = 0; - virtual void setSourceDevice(QIODevice *device) = 0; - - virtual void start() = 0; - virtual void stop() = 0; - - virtual QAudioFormat audioFormat() const = 0; - virtual void setAudioFormat(const QAudioFormat &format) = 0; - - virtual QAudioBuffer read() = 0; - virtual bool bufferAvailable() const = 0; - - virtual qint64 position() const = 0; - virtual qint64 duration() const = 0; - -Q_SIGNALS: - void stateChanged(QAudioDecoder::State newState); - void formatChanged(const QAudioFormat &format); - void sourceChanged(); - - void error(int error, const QString &errorString); - - void bufferReady(); - void bufferAvailableChanged(bool available); - void finished(); - - void positionChanged(qint64 position); - void durationChanged(qint64 duration); - -protected: - explicit QAudioDecoderControl(QObject *parent = nullptr); -}; - -QT_END_NAMESPACE - -#endif // QAUDIODECODERCONTROL_H diff --git a/src/multimedia/controls/qcameracontrol.cpp b/src/multimedia/controls/qcameracontrol.cpp deleted file mode 100644 index a55c198ad..000000000 --- a/src/multimedia/controls/qcameracontrol.cpp +++ /dev/null @@ -1,167 +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$ -** -****************************************************************************/ - -#include <qcameracontrol.h> - -QT_BEGIN_NAMESPACE - -/*! - \class QCameraControl - \obsolete - - - - \brief The QCameraControl class is an abstract base class for - classes that control still cameras or video cameras. - - \inmodule QtMultimedia - - \ingroup multimedia_control -*/ - -/*! - Constructs a camera control object with \a parent. -*/ - -QCameraControl::QCameraControl(QObject *parent) - : QObject(parent) -{ -} - -/*! - \fn QCameraControl::state() const - - Returns the state of the camera service. - - \sa QCamera::state -*/ - -/*! - \fn QCameraControl::setState(QCamera::State state) - - Sets the camera \a state. - - State changes are synchronous and indicate user intention, - while camera status is used as a feedback mechanism to inform application about backend status. - Status changes are reported asynchronously with QCameraControl::statusChanged() signal. - - \sa QCamera::State -*/ - -/*! - \fn void QCameraControl::stateChanged(QCamera::State state) - - Signal emitted when the camera \a state changes. - - In most cases the state chage is caused by QCameraControl::setState(), - but if critical error has occurred the state changes to QCamera::UnloadedState. -*/ - -/*! - \fn QCameraControl::status() const - - Returns the status of the camera service. - - \sa QCamera::state -*/ - -/*! - \fn void QCameraControl::statusChanged(QCamera::Status status) - - Signal emitted when the camera \a status changes. -*/ - - -/*! - \fn void QCameraControl::error(int error, const QString &errorString) - - Signal emitted when an error occurs with error code \a error and - a description of the error \a errorString. -*/ - -/*! - \fn bool QCameraControl::canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const - - Returns true if backend can effectively apply changing camera properties of \a changeType type - while the camera state is QCamera::Active and camera status matches \a status parameter. - - If backend doesn't support applying this change in the active state, it will be stopped - before the settings are changed and restarted after. - Otherwise the backend should apply the change in the current state, - with the camera status indicating the progress, if necessary. -*/ - -/*! - \enum QCameraControl::PropertyChangeType - - \value CaptureMode Indicates the capture mode is changed. - \value ImageEncodingSettings Image encoder settings are changed, including resolution. - \value VideoEncodingSettings - Video encoder settings are changed, including audio, video and container settings. - \value Viewfinder Viewfinder is changed. - \value ViewfinderSettings Viewfinder settings are changed. -*/ - -/*! - \fn QCameraControl::supportedViewfinderSettings() const - - Returns a list of supported camera viewfinder settings. - - The list is ordered by preference; preferred settings come first. -*/ - -/*! - \fn QCameraControl::viewfinderSettings() const - - Returns the viewfinder settings. - - If undefined or unsupported values are passed to QCameraControl::setViewfinderSettings(), - this function returns the actual settings used by the camera viewfinder. These may be available - only once the camera is active. -*/ - -/*! - \fn QCameraControl::setViewfinderSettings(const QCameraViewfinderSettings &settings) - - Sets the camera viewfinder \a settings. -*/ - -QT_END_NAMESPACE - -#include "moc_qcameracontrol.cpp" diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h deleted file mode 100644 index cfcd29cd3..000000000 --- a/src/multimedia/controls/qcameracontrol.h +++ /dev/null @@ -1,95 +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 QCAMERACONTROL_H -#define QCAMERACONTROL_H - -#include <QtCore/qobject.h> -#include <QtMultimedia/qtmultimediaglobal.h> - -#include <QtMultimedia/qcamera.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; -class QCameraFocusControl; -class QCameraExposureControl; -class QCameraImageProcessingControl; - -class Q_MULTIMEDIA_EXPORT QCameraControl : public QObject -{ - Q_OBJECT - -public: - enum PropertyChangeType { - ImageEncodingSettings = 2, - VideoEncodingSettings = 3, - Viewfinder = 4, - }; - - virtual QCamera::State state() const = 0; - virtual void setState(QCamera::State state) = 0; - - virtual QCamera::Status status() const = 0; - - virtual void setCamera(const QCameraInfo &camera) = 0; - - virtual bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const = 0; - - virtual QCameraFocusControl *focusControl() { return nullptr; } - virtual QCameraExposureControl *exposureControl() { return nullptr; } - virtual QCameraImageProcessingControl *imageProcessingControl() { return nullptr; } - - virtual void setVideoSurface(QAbstractVideoSurface *surface) = 0; - -Q_SIGNALS: - void stateChanged(QCamera::State); - void statusChanged(QCamera::Status); - void error(int error, const QString &errorString); - -protected: - explicit QCameraControl(QObject *parent = nullptr); -}; - -QT_END_NAMESPACE - - -#endif // QCAMERACONTROL_H - diff --git a/src/multimedia/controls/qcameraexposurecontrol.cpp b/src/multimedia/controls/qcameraexposurecontrol.cpp deleted file mode 100644 index fcfd4da22..000000000 --- a/src/multimedia/controls/qcameraexposurecontrol.cpp +++ /dev/null @@ -1,170 +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$ -** -****************************************************************************/ - -#include <qcameraexposurecontrol.h> - -QT_BEGIN_NAMESPACE - -/*! - \class QCameraExposureControl - \obsolete - - \brief The QCameraExposureControl class allows controlling camera exposure parameters. - - \inmodule QtMultimedia - - \ingroup multimedia_control - - The QCameraExposure class is the usual method of adjusting exposure related parameters - when using camera functionality. This class provides a more complete but less easy - to use interface, and also forms the interface to implement when writing a new - implementation of QCamera functionality. - - You can adjust a number of parameters that will affect images and video taken with - the corresponding QCamera object - see the \l {QCameraExposureControl::ExposureParameter}{ExposureParameter} enumeration. - - \sa QCameraExposure, QCamera -*/ - -/*! - Constructs a camera exposure control object with \a parent. -*/ -QCameraExposureControl::QCameraExposureControl(QObject *parent) - : QObject(parent) -{ -} - -/*! - \enum QCameraExposureControl::ExposureParameter - \value ISO - Camera ISO sensitivity, specified as integer value. - \value Aperture - Lens aperture is specified as an qreal F number. - The supported apertures list can change depending on the focal length, - in such a case the exposureParameterRangeChanged() signal is emitted. - \value ShutterSpeed - Shutter speed in seconds, specified as qreal. - \value ExposureCompensation - Exposure compensation, specified as qreal EV value. - \value TorchPower - Manual torch power, specified as qreal value. - Accepted power range is [0..1.0], - with 0 value means no light and 1.0 corresponds to full torch power. - - This value is only used in the \l{QCameraExposure::FlashTorch}{torch flash mode}. - \value ExposureMode - Camera exposure mode. -*/ - -/*! - \fn QCameraExposureControl::isParameterSupported(ExposureParameter parameter) const - - Returns true is exposure \a parameter is supported by backend. - \since 5.0 -*/ - -/*! - \fn QCameraExposureControl::requestedValue(ExposureParameter parameter) const - - Returns the requested exposure \a parameter value. - - \since 5.0 -*/ - -/*! - \fn QCameraExposureControl::actualValue(ExposureParameter parameter) const - - Returns the actual exposure \a parameter value, or invalid QVariant() if the value is unknown or not supported. - - The actual parameter value may differ for the requested one if automatic mode is selected or - camera supports only limited set of values within the supported range. - \since 5.0 -*/ - - -/*! - \fn QCameraExposureControl::supportedParameterRange(ExposureParameter parameter, bool *continuous = 0) const - - Returns the list of supported \a parameter values; - - If the camera supports arbitrary exposure parameter value within the supported range, - *\a continuous is set to true, otherwise *\a continuous is set to false. - - \since 5.0 -*/ - -/*! - \fn bool QCameraExposureControl::setValue(ExposureParameter parameter, const QVariant& value) - - Set the exposure \a parameter to \a value. - If a null or invalid QVariant is passed, backend should choose the value automatically, - and if possible report the actual value to user with QCameraExposureControl::actualValue(). - - Returns true if parameter is supported and value is correct. - \since 5.0 -*/ - -/*! - \fn void QCameraExposureControl::requestedValueChanged(int parameter) - - Signal emitted when the requested exposure \a parameter value has changed, - usually in result of setValue() call. - \since 5.0 -*/ - -/*! - \fn void QCameraExposureControl::actualValueChanged(int parameter) - - Signal emitted when the actual exposure \a parameter value has changed, - usually in result of auto exposure algorithms or manual exposure parameter applied. - - \since 5.0 -*/ - -/*! - \fn void QCameraExposureControl::parameterRangeChanged(int parameter) - - Signal emitted when the supported range of exposure \a parameter values has changed. - - \since 5.0 -*/ - -QT_END_NAMESPACE - -#include "moc_qcameraexposurecontrol.cpp" diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h deleted file mode 100644 index 58c19dbab..000000000 --- a/src/multimedia/controls/qcameraexposurecontrol.h +++ /dev/null @@ -1,99 +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 QCAMERAEXPOSURECONTROL_H -#define QCAMERAEXPOSURECONTROL_H - -#include <QtCore/qobject.h> -#include <QtMultimedia/qtmultimediaglobal.h> - -#include <QtMultimedia/qcameraexposure.h> -#include <QtMultimedia/qcamera.h> -#include <QtMultimedia/qmediaenumdebug.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraExposureControl : public QObject -{ - Q_OBJECT - Q_ENUMS(ExposureParameter) - -public: - enum ExposureParameter { - ISO, - Aperture, - ShutterSpeed, - ExposureCompensation, - TorchPower, - ExposureMode - }; - - virtual bool isParameterSupported(ExposureParameter parameter) const = 0; - virtual QVariantList supportedParameterRange(ExposureParameter parameter, bool *continuous) const = 0; - - virtual QVariant requestedValue(ExposureParameter parameter) const = 0; - virtual QVariant actualValue(ExposureParameter parameter) const = 0; - virtual bool setValue(ExposureParameter parameter, const QVariant& value) = 0; - - virtual QCameraExposure::FlashModes flashMode() const = 0; - virtual void setFlashMode(QCameraExposure::FlashModes mode) = 0; - virtual bool isFlashModeSupported(QCameraExposure::FlashModes mode) const = 0; - - virtual bool isFlashReady() const = 0; - -Q_SIGNALS: - void flashReady(bool); - void requestedValueChanged(int parameter); - void actualValueChanged(int parameter); - void parameterRangeChanged(int parameter); - -protected: - explicit QCameraExposureControl(QObject *parent = nullptr); -}; - -QT_END_NAMESPACE - -Q_MEDIA_ENUM_DEBUG(QCameraExposureControl, ExposureParameter) - - -#endif // QCAMERAEXPOSURECONTROL_H - diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp deleted file mode 100644 index f110b3c89..000000000 --- a/src/multimedia/controls/qcamerafocuscontrol.cpp +++ /dev/null @@ -1,264 +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$ -** -****************************************************************************/ - -#include <qcamerafocuscontrol.h> - -QT_BEGIN_NAMESPACE - -/*! - \class QCameraFocusControl - \obsolete - - - \brief The QCameraFocusControl class supplies control for - focusing related camera parameters. - - \inmodule QtMultimedia - \ingroup multimedia_control - - \sa QCamera -*/ - -/*! - Constructs a camera control object with \a parent. -*/ - -QCameraFocusControl::QCameraFocusControl(QObject *parent) - : QObject(parent) -{ -} - -/*! - \fn QCameraFocus::FocusModes QCameraFocusControl::focusMode() const - - Returns the focus mode being used. -*/ - - -/*! - \fn void QCameraFocusControl::setFocusMode(QCameraFocus::FocusModes mode) - - Set the focus mode to \a mode. -*/ - - -/*! - \fn bool QCameraFocusControl::isFocusModeSupported(QCameraFocus::FocusModes mode) const - - Returns true if focus \a mode is supported. -*/ - -/*! - \fn QCameraFocusControl::focusPointMode() const - - Returns the camera focus point selection mode. -*/ - -/*! - \fn QCameraFocusControl::setFocusPointMode(QCameraFocus::FocusPointMode mode) - - Sets the camera focus point selection \a mode. -*/ - -/*! - \fn QCameraFocusControl::isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const - - Returns true if the camera focus point \a mode is supported. -*/ - -/*! - \fn QCameraFocusControl::customFocusPoint() const - - Return the position of custom focus point, in relative frame coordinates: - QPointF(0,0) points to the left top frame point, QPointF(0.5,0.5) points to the frame center. - - Custom focus point is used only in FocusPointCustom focus mode. -*/ - -/*! - \fn QCameraFocusControl::setCustomFocusPoint(const QPointF &point) - - Sets the custom focus \a point. - - If camera supports fixed set of focus points, - it should use the nearest supported focus point, - and return the actual focus point with QCameraFocusControl::focusZones(). - - \sa QCameraFocusControl::customFocusPoint(), QCameraFocusControl::focusZones() -*/ - -/*! - \fn QCameraFocusControl::focusZones() const - - Returns the list of zones, the camera is using for focusing or focused on. -*/ - -/*! - \fn QCameraFocusControl::focusZonesChanged() - - Signal is emitted when the set of zones, camera focused on is changed. - - Usually the zones list is changed when the camera is focused. - - \sa QCameraFocusControl::focusZones() -*/ - -/*! - \fn void QCameraFocusControl::focusModeChanged(QCameraFocus::FocusModes mode) - - Signal is emitted when the focus \a mode is changed, - usually in result of QCameraFocusControl::setFocusMode call or capture mode changes. - - \sa QCameraFocusControl::focusMode(), QCameraFocusControl::setFocusMode() -*/ - -/*! - \fn void QCameraFocusControl::focusPointModeChanged(QCameraFocus::FocusPointMode mode) - - Signal is emitted when the focus point \a mode is changed, - usually in result of QCameraFocusControl::setFocusPointMode call or capture mode changes. - - \sa QCameraFocusControl::focusPointMode(), QCameraFocusControl::setFocusPointMode() -*/ - -/*! - \fn void QCameraFocusControl::customFocusPointChanged(const QPointF &point) - - Signal is emitted when the custom focus \a point is changed. - - \sa QCameraFocusControl::customFocusPoint(), QCameraFocusControl::setCustomFocusPoint() -*/ - -/*! - \fn qreal QCameraFocusControl::maximumOpticalZoom() const - - Returns the maximum optical zoom value, or 1.0 if optical zoom is not supported. -*/ - - -/*! - \fn qreal QCameraFocusControl::maximumDigitalZoom() const - - Returns the maximum digital zoom value, or 1.0 if digital zoom is not supported. -*/ - - -/*! - \fn qreal QCameraFocusControl::requestedOpticalZoom() const - - Return the requested optical zoom value. -*/ - -/*! - \fn qreal QCameraFocusControl::requestedDigitalZoom() const - - Return the requested digital zoom value. -*/ - -/*! - \fn qreal QCameraFocusControl::currentOpticalZoom() const - - Return the current optical zoom value. -*/ - -/*! - \fn qreal QCameraFocusControl::currentDigitalZoom() const - - Return the current digital zoom value. -*/ - -/*! - \fn void QCameraFocusControl::zoomTo(qreal optical, qreal digital) - - Sets \a optical and \a digital zoom values. - - Zooming can be asynchronous with value changes reported with - currentDigitalZoomChanged() and currentOpticalZoomChanged() signals. - - The backend should expect and correctly handle frequent zoomTo() calls - during zoom animations or slider movements. -*/ - - -/*! - \fn void QCameraFocusControl::currentOpticalZoomChanged(qreal zoom) - - Signal emitted when the current optical \a zoom value changed. -*/ - -/*! - \fn void QCameraFocusControl::currentDigitalZoomChanged(qreal zoom) - - Signal emitted when the current digital \a zoom value changed. -*/ - -/*! - \fn void QCameraFocusControl::requestedOpticalZoomChanged(qreal zoom) - - Signal emitted when the requested optical \a zoom value changed. -*/ - -/*! - \fn void QCameraFocusControl::requestedDigitalZoomChanged(qreal zoom) - - Signal emitted when the requested digital \a zoom value changed. -*/ - - -/*! - \fn void QCameraFocusControl::maximumOpticalZoomChanged(qreal zoom) - - Signal emitted when the maximum supported optical \a zoom value changed. - - The maximum supported zoom value can depend on other camera settings, - like focusing mode. -*/ - -/*! - \fn void QCameraFocusControl::maximumDigitalZoomChanged(qreal zoom) - - Signal emitted when the maximum supported digital \a zoom value changed. - - The maximum supported zoom value can depend on other camera settings, - like capture mode or resolution. -*/ - -QT_END_NAMESPACE - -#include "moc_qcamerafocuscontrol.cpp" diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h deleted file mode 100644 index aafae5b97..000000000 --- a/src/multimedia/controls/qcamerafocuscontrol.h +++ /dev/null @@ -1,95 +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 QCAMERAFOCUSCONTROL_H -#define QCAMERAFOCUSCONTROL_H - -#include <QtCore/qobject.h> -#include <QtMultimedia/qtmultimediaglobal.h> - -#include <QtMultimedia/qcamerafocus.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraFocusControl : public QObject -{ - Q_OBJECT - -public: - virtual QCameraFocus::FocusModes focusMode() const = 0; - virtual void setFocusMode(QCameraFocus::FocusModes mode) = 0; - virtual bool isFocusModeSupported(QCameraFocus::FocusModes mode) const = 0; - - virtual QCameraFocus::FocusPointMode focusPointMode() const = 0; - virtual void setFocusPointMode(QCameraFocus::FocusPointMode mode) = 0; - virtual bool isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const = 0; - virtual QPointF customFocusPoint() const = 0; - virtual void setCustomFocusPoint(const QPointF &point) = 0; - - virtual QCameraFocusZoneList focusZones() const = 0; - - struct ZoomRange { - float min; - float max; - }; - - virtual ZoomRange zoomFactorRange() const = 0; - // smaller 0: zoom instantly, rate in power-of-two/sec - virtual void zoomTo(float newZoomFactor, float rate = -1.) = 0; - -Q_SIGNALS: - void focusModeChanged(QCameraFocus::FocusModes mode); - void focusPointModeChanged(QCameraFocus::FocusPointMode mode); - void customFocusPointChanged(const QPointF &point); - - void focusZonesChanged(); - - -protected: - explicit QCameraFocusControl(QObject *parent = nullptr); -}; - -QT_END_NAMESPACE - - -#endif // QCAMERAFOCUSCONTROL_H - diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp deleted file mode 100644 index a0d7770c4..000000000 --- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp +++ /dev/null @@ -1,172 +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$ -** -****************************************************************************/ - -#include <qcameraimagecapturecontrol.h> -#include <QtCore/qstringlist.h> - -QT_BEGIN_NAMESPACE - -/*! - \class QCameraImageCaptureControl - \obsolete - - \brief The QCameraImageCaptureControl class provides a control interface - for image capture services. - - \inmodule QtMultimedia - \ingroup multimedia_control - -*/ - -/*! - Constructs a new image capture control object with the given \a parent -*/ -QCameraImageCaptureControl::QCameraImageCaptureControl(QObject *parent) - :QObject(parent) -{ -} - -/*! - \fn QCameraImageCaptureControl::isReadyForCapture() const - - Identifies if a capture control is ready to perform a capture - immediately (all the resources necessary for image capture are allocated, - hardware initialized, flash is charged, etc). - - Returns true if the camera is ready for capture; and false if it is not. - - It's permissible to call capture() while the camera status is QCamera::ActiveStatus - regardless of isReadyForCapture property value. - If camera is not ready to capture image immediately, - the capture request is queued with all the related camera settings - to be executed as soon as possible. -*/ - -/*! - \fn QCameraImageCaptureControl::readyForCaptureChanged(bool ready) - - Signals that a capture control's \a ready state has changed. -*/ - -/*! - \fn QCameraImageCaptureControl::capture(const QString &fileName) - - Initiates the capture of an image to \a fileName. - The \a fileName can be relative or empty, - in this case the service should use the system specific place - and file naming scheme. - - The Camera service should save all the capture parameters - like exposure settings or image processing parameters, - so changes to camera parameters after capture() is called - do not affect previous capture requests. - - Returns the capture request id number, which is used later - with imageExposed(), imageCaptured() and imageSaved() signals. -*/ - -/*! - \fn QCameraImageCaptureControl::cancelCapture() - - Cancel pending capture requests. -*/ - -/*! - \fn QCameraImageCaptureControl::imageExposed(int requestId) - - Signals that an image with it \a requestId - has just been exposed. - This signal can be used for the shutter sound or other indicaton. -*/ - -/*! - \fn QCameraImageCaptureControl::imageCaptured(int requestId, const QImage &preview) - - Signals that an image with it \a requestId - has been captured and a \a preview is available. -*/ - -/*! - \fn QCameraImageCaptureControl::imageMetadataAvailable(int id, const QMediaMetaData &metaData) - - Signals that a metadata for an image with request \a id is available. - - This signal should be emitted between imageExposed and imageSaved signals. -*/ - -/*! - \fn QCameraImageCaptureControl::imageAvailable(int requestId, const QVideoFrame &buffer) - - Signals that a captured \a buffer with a \a requestId is available. -*/ - -/*! - \fn QCameraImageCaptureControl::imageSaved(int requestId, const QString &fileName) - - Signals that a captured image with a \a requestId has been saved - to \a fileName. -*/ - -/*! - \fn QCameraImageCaptureControl::imageSettings() const - - Returns the currently used image encoder settings. - - The returned value may be different than passed to setImageSettings() - if the settings contains defaulted or undefined parameters. -*/ - -/*! - \fn QCameraImageCaptureControl::setImageSettings(const QImageEncoderSettings &settings) - - Sets the selected image encoder \a settings. -*/ - -/*! - \fn QCameraImageCaptureControl::error(int id, int error, const QString &errorString) - - Signals the capture request \a id failed with \a error code and message \a errorString. - - \sa QCameraImageCapture::Error -*/ - - -QT_END_NAMESPACE - -#include "moc_qcameraimagecapturecontrol.cpp" diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h deleted file mode 100644 index d59e9c201..000000000 --- a/src/multimedia/controls/qcameraimagecapturecontrol.h +++ /dev/null @@ -1,85 +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 QCAMERAIMAGECAPTURECONTROL_H -#define QCAMERAIMAGECAPTURECONTROL_H - -#include <QtMultimedia/qcameraimagecapture.h> - -QT_BEGIN_NAMESPACE - -class QImage; - -class Q_MULTIMEDIA_EXPORT QCameraImageCaptureControl : public QObject -{ - Q_OBJECT - -public: - virtual bool isReadyForCapture() const = 0; - - virtual int capture(const QString &fileName) = 0; - virtual void cancelCapture() = 0; - - virtual QCameraImageCapture::CaptureDestinations captureDestination() const = 0; - virtual void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) = 0; - - virtual QImageEncoderSettings imageSettings() const = 0; - virtual void setImageSettings(const QImageEncoderSettings &settings) = 0; - - virtual void setMetaData(const QMediaMetaData &) {} -Q_SIGNALS: - void readyForCaptureChanged(bool ready); - - void imageExposed(int requestId); - void imageCaptured(int requestId, const QImage &preview); - void imageMetadataAvailable(int id, const QMediaMetaData &); - void imageAvailable(int requestId, const QVideoFrame &buffer); - void imageSaved(int requestId, const QString &fileName); - - void error(int id, int error, const QString &errorString); - -protected: - explicit QCameraImageCaptureControl(QObject *parent = nullptr); -}; - -QT_END_NAMESPACE - - -#endif // QCAMERAIMAGECAPTURECONTROL_H - diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp deleted file mode 100644 index 6fe9be0a6..000000000 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp +++ /dev/null @@ -1,147 +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$ -** -****************************************************************************/ - -#include <qcameraimageprocessingcontrol.h> - -QT_BEGIN_NAMESPACE - -/*! - \class QCameraImageProcessingControl - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - - \brief The QCameraImageProcessingControl class provides an abstract class - for controlling image processing parameters, like white balance, - contrast, saturation. - - Camera service may choose the parameters of image processing pipeline depending - on sensor properties camera settings and capture parameters. - - This control allows to modify some parameters of image processing pipeline - to achieve desired results. - - Parameters with the "Adjustment" suffix, like ContrastAdjustment, SaturationAdjustment etc - allows to adjust the parameter values, selected by camera engine, - while parameters like Contrast and Saturation overwrites them. - - \sa QCamera -*/ - -/*! - Constructs an image processing control object with \a parent. -*/ - -QCameraImageProcessingControl::QCameraImageProcessingControl(QObject *parent) - : QObject(parent) -{ -} - -/*! - \fn bool QCameraImageProcessingControl::isParameterSupported(ProcessingParameter parameter) const - - Returns true if the camera supports adjusting image processing \a parameter. - - Usually the supported setting is static, - but some parameters may not be available depending on other - camera settings, like presets. - In such case the currently supported parameters should be returned. -*/ - -/*! - \fn bool QCameraImageProcessingControl::isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const - - Returns true if the camera supports setting the image processing \a parameter \a value. - - It's used only for parameters with a limited set of values, like WhiteBalancePreset. -*/ - - -/*! - \fn QCameraImageProcessingControl::parameter(ProcessingParameter parameter) const - - Returns the image processing \a parameter value. -*/ - -/*! - \fn QCameraImageProcessingControl::setParameter(ProcessingParameter parameter, const QVariant &value) - - Sets the image processing \a parameter \a value. - Passing the null or invalid QVariant value allows - backend to choose the suitable parameter value. - - The valid values range depends on the parameter type. - For WhiteBalancePreset the value should be one of QCameraImageProcessing::WhiteBalanceMode values; - for Contrast, Saturation and Brightness the value should be in [0..1.0] range with invalid QVariant - value indicating the default parameter value; - for ContrastAdjustment, SaturationAdjustment, BrightnessAdjustment, the value should be - in [-1.0..1.0] range with default 0. -*/ - -/*! - \enum QCameraImageProcessingControl::ProcessingParameter - - \value WhiteBalancePreset - The white balance preset. - \value ColorTemperature - Color temperature in K. This value is used when the manual white balance mode is selected. - \value Contrast - Image contrast. - \value Saturation - Image saturation. - \value Brightness - Image brightness. - \value ContrastAdjustment - Image contrast adjustment. - \value SaturationAdjustment - Image saturation adjustment. - \value BrightnessAdjustment - Image brightness adjustment. - \value ColorFilter - Image filter applied. Since 5.5 - \value ExtendedParameter - The base value for platform specific extended parameters. - */ - -QT_END_NAMESPACE - -#include "moc_qcameraimageprocessingcontrol.cpp" diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h deleted file mode 100644 index 334a165dc..000000000 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.h +++ /dev/null @@ -1,87 +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 QCAMERAIMAGEPROCESSINGCONTROL_H -#define QCAMERAIMAGEPROCESSINGCONTROL_H - -#include <QtCore/qobject.h> -#include <QtMultimedia/qtmultimediaglobal.h> - -#include <QtMultimedia/qcamera.h> -#include <QtMultimedia/qmediaenumdebug.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraImageProcessingControl : public QObject -{ - Q_OBJECT - Q_ENUMS(ProcessingParameter) - -public: - enum ProcessingParameter { - WhiteBalancePreset, - ColorTemperature, - Contrast, - Saturation, - Brightness, - ContrastAdjustment, - SaturationAdjustment, - BrightnessAdjustment, - ColorFilter, - ExtendedParameter = 1000 - }; - - virtual bool isParameterSupported(ProcessingParameter) const = 0; - virtual bool isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const = 0; - virtual QVariant parameter(ProcessingParameter parameter) const = 0; - virtual void setParameter(ProcessingParameter parameter, const QVariant &value) = 0; - -protected: - explicit QCameraImageProcessingControl(QObject *parent = nullptr); -}; - -QT_END_NAMESPACE - -Q_MEDIA_ENUM_DEBUG(QCameraImageProcessingControl, ProcessingParameter) - -#endif - diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp deleted file mode 100644 index e6eb1779f..000000000 --- a/src/multimedia/controls/qmediarecordercontrol.cpp +++ /dev/null @@ -1,197 +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$ -** -****************************************************************************/ - -#include "qmediarecordercontrol.h" - -QT_BEGIN_NAMESPACE - - -/*! - \class QMediaRecorderControl - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - \brief The QMediaRecorderControl class provides access to the recording - functionality. - - This control provides a means to set the \l {outputLocation()}{output location}, - and record, pause and stop recording via the \l setState() method. It also - provides feedback on the \l {duration()}{duration} of the recording. - - \sa QMediaRecorder - -*/ - -/*! - Constructs a media recorder control with the given \a parent. -*/ - -QMediaRecorderControl::QMediaRecorderControl(QObject* parent) - : QObject(parent) -{ -} - -/*! - \fn QUrl QMediaRecorderControl::outputLocation() const - - Returns the current output location being used. -*/ - -/*! - \fn bool QMediaRecorderControl::setOutputLocation(const QUrl &location) - - Sets the output \a location and returns if this operation is successful. - If file at the output location already exists, it should be overwritten. - - The \a location can be relative or empty; - in this case the service should use the system specific place and file naming scheme. - - After recording has started, the backend should report the actual file location - with actualLocationChanged() signal. -*/ - -/*! - \fn QMediaRecorder::State QMediaRecorderControl::state() const - - Return the current recording state. -*/ - -/*! - \fn QMediaRecorder::Status QMediaRecorderControl::status() const - - Return the current recording status. -*/ - -/*! - \fn qint64 QMediaRecorderControl::duration() const - - Return the current duration in milliseconds. -*/ - -/*! - \fn void QMediaRecorderControl::setState(QMediaRecorder::State state) - - Set the media recorder \a state. -*/ - -/*! - \fn void QMediaRecorderControl::applySettings() - - Commits the encoder settings and performs pre-initialization to reduce delays when recording - is started. -*/ - -/*! - \fn bool QMediaRecorderControl::isMuted() const - - Returns true if the recorder is muted, and false if it is not. -*/ - -/*! - \fn void QMediaRecorderControl::setMuted(bool muted) - - Sets the \a muted state of a media recorder. -*/ - -/*! - \fn qreal QMediaRecorderControl::volume() const - - Returns the audio volume of a media recorder control. -*/ - -/*! - \fn void QMediaRecorderControl::setVolume(qreal volume) - - Sets the audio \a volume of a media recorder control. - - The volume is scaled linearly, ranging from \c 0 (silence) to \c 100 (full volume). -*/ - -/*! - \fn void QMediaRecorderControl::stateChanged(QMediaRecorder::State state) - - Signals that the \a state of a media recorder has changed. -*/ - -/*! - \fn void QMediaRecorderControl::statusChanged(QMediaRecorder::Status status) - - Signals that the \a status of a media recorder has changed. -*/ - - -/*! - \fn void QMediaRecorderControl::durationChanged(qint64 duration) - - Signals that the \a duration of the recorded media has changed. - - This only emitted when there is a discontinuous change in the duration such as being reset to 0. -*/ - -/*! - \fn void QMediaRecorderControl::mutedChanged(bool muted) - - Signals that the \a muted state of a media recorder has changed. -*/ - -/*! - \fn void QMediaRecorderControl::volumeChanged(qreal gain) - - Signals that the audio \a gain value has changed. -*/ - -/*! - \fn void QMediaRecorderControl::actualLocationChanged(const QUrl &location) - - Signals that the actual media \a location has changed. - This signal should be emitted at start of recording. -*/ - -/*! - \fn void QMediaRecorderControl::error(int error, const QString &errorString) - - Signals that an \a error has occurred. The \a errorString describes the error. -*/ - -QT_END_NAMESPACE - -#include "moc_qmediarecordercontrol.cpp" diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h deleted file mode 100644 index 5831b8948..000000000 --- a/src/multimedia/controls/qmediarecordercontrol.h +++ /dev/null @@ -1,104 +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 QMEDIARECORDERCONTROL_H -#define QMEDIARECORDERCONTROL_H - -#include <QtMultimedia/qmediarecorder.h> -#include <QtMultimedia/qmediametadata.h> - -QT_BEGIN_NAMESPACE - -class QUrl; -QT_END_NAMESPACE - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QMediaRecorderControl : public QObject -{ - Q_OBJECT - -public: - virtual QUrl outputLocation() const = 0; - virtual bool setOutputLocation(const QUrl &location) = 0; - - virtual QMediaRecorder::State state() const = 0; - virtual QMediaRecorder::Status status() const = 0; - - virtual qint64 duration() const = 0; - - virtual bool isMuted() const = 0; - virtual qreal volume() const = 0; - - virtual void applySettings() = 0; - - virtual QAudioDeviceInfo audioInput() const = 0; - virtual bool setAudioInput(const QAudioDeviceInfo &id) = 0; - - virtual void setEncoderSettings(const QMediaEncoderSettings &settings) = 0; - - virtual void setMetaData(const QMediaMetaData &) {} - virtual QMediaMetaData metaData() const { return {}; } - -Q_SIGNALS: - void stateChanged(QMediaRecorder::State state); - void statusChanged(QMediaRecorder::Status status); - void durationChanged(qint64 position); - void mutedChanged(bool muted); - void volumeChanged(qreal volume); - void actualLocationChanged(const QUrl &location); - void error(int error, const QString &errorString); - void metaDataChanged(); - -public Q_SLOTS: - virtual void setState(QMediaRecorder::State state) = 0; - virtual void setMuted(bool muted) = 0; - virtual void setVolume(qreal volume) = 0; - -protected: - explicit QMediaRecorderControl(QObject *parent = nullptr); -}; - -QT_END_NAMESPACE - - -#endif |