diff options
Diffstat (limited to 'src/multimedia/controls')
73 files changed, 0 insertions, 9066 deletions
diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri deleted file mode 100644 index c0eb28936..000000000 --- a/src/multimedia/controls/controls.pri +++ /dev/null @@ -1,80 +0,0 @@ - -INCLUDEPATH += controls - -PUBLIC_HEADERS += \ - controls/qaudiodecodercontrol.h \ - controls/qaudioencodersettingscontrol.h \ - controls/qaudioinputselectorcontrol.h \ - controls/qaudiooutputselectorcontrol.h \ - controls/qcameracapturebufferformatcontrol.h \ - controls/qcameracapturedestinationcontrol.h \ - controls/qcameracontrol.h \ - controls/qcamerainfocontrol.h \ - controls/qcameraexposurecontrol.h \ - controls/qcamerafeedbackcontrol.h \ - controls/qcameraflashcontrol.h \ - controls/qcamerafocuscontrol.h \ - controls/qcamerazoomcontrol.h \ - controls/qcameraimagecapturecontrol.h \ - controls/qcameraimageprocessingcontrol.h \ - controls/qcameralockscontrol.h \ - controls/qcameraviewfindersettingscontrol.h \ - controls/qimageencodercontrol.h \ - controls/qmediacontainercontrol.h \ - controls/qmediagaplessplaybackcontrol.h \ - controls/qmediaplayercontrol.h \ - controls/qmediarecordercontrol.h \ - controls/qmediastreamscontrol.h \ - controls/qmetadatareadercontrol.h \ - controls/qmetadatawritercontrol.h \ - controls/qvideodeviceselectorcontrol.h \ - controls/qvideoencodersettingscontrol.h \ - controls/qvideorenderercontrol.h \ - controls/qvideowindowcontrol.h \ - controls/qmediaaudioprobecontrol.h \ - controls/qmediavideoprobecontrol.h \ - controls/qmediaavailabilitycontrol.h \ - controls/qaudiorolecontrol.h \ - controls/qcustomaudiorolecontrol.h - -PRIVATE_HEADERS += \ - controls/qmediaplaylistcontrol_p.h \ - controls/qmediaplaylistsourcecontrol_p.h - -SOURCES += \ - controls/qcameracapturebufferformatcontrol.cpp \ - controls/qcameracapturedestinationcontrol.cpp \ - controls/qcameracontrol.cpp \ - controls/qcamerainfocontrol.cpp \ - controls/qcameraexposurecontrol.cpp \ - controls/qcamerafeedbackcontrol.cpp \ - controls/qcameraflashcontrol.cpp \ - controls/qcamerafocuscontrol.cpp \ - controls/qcamerazoomcontrol.cpp \ - controls/qcameraimagecapturecontrol.cpp \ - controls/qcameraimageprocessingcontrol.cpp \ - controls/qcameralockscontrol.cpp \ - controls/qcameraviewfindersettingscontrol.cpp \ - controls/qimageencodercontrol.cpp \ - controls/qmediacontainercontrol.cpp \ - controls/qmediagaplessplaybackcontrol.cpp \ - controls/qmediaplayercontrol.cpp \ - controls/qmediaplaylistcontrol.cpp \ - controls/qmediaplaylistsourcecontrol.cpp \ - controls/qmediarecordercontrol.cpp \ - controls/qmediastreamscontrol.cpp \ - controls/qmetadatareadercontrol.cpp \ - controls/qmetadatawritercontrol.cpp \ - controls/qvideorenderercontrol.cpp \ - controls/qvideowindowcontrol.cpp \ - controls/qmediaaudioprobecontrol.cpp \ - controls/qmediavideoprobecontrol.cpp \ - controls/qmediaavailabilitycontrol.cpp \ - controls/qaudiodecodercontrol.cpp \ - controls/qvideoencodersettingscontrol.cpp \ - controls/qaudioencodersettingscontrol.cpp \ - controls/qaudioinputselectorcontrol.cpp \ - controls/qaudiooutputselectorcontrol.cpp \ - controls/qvideodeviceselectorcontrol.cpp \ - controls/qaudiorolecontrol.cpp \ - controls/qcustomaudiorolecontrol.cpp diff --git a/src/multimedia/controls/qaudiodecodercontrol.cpp b/src/multimedia/controls/qaudiodecodercontrol.cpp deleted file mode 100644 index 711303174..000000000 --- a/src/multimedia/controls/qaudiodecodercontrol.cpp +++ /dev/null @@ -1,267 +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 "qmediacontrol_p.h" -#include "qaudiodecodercontrol.h" - -QT_BEGIN_NAMESPACE - - -/*! - \class QAudioDecoderControl - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - \brief The QAudioDecoderControl class provides access to the audio decoding - functionality of a QMediaService. - - \preliminary - - The functionality provided by this control is exposed to application - code through the QAudioDecoder class. - - The interface name of QAudioDecoderControl is \c org.qt-project.qt.audiodecodercontrol/5.0 as - defined in QAudioDecoderControl_iid. - - \sa QMediaService::requestControl(), QAudioDecoder -*/ - -/*! - \macro QAudioDecoderControl_iid - - \c org.qt-project.qt.audiodecodercontrol/5.0 - - Defines the interface name of the QAudioDecoderControl class. - - \relates QAudioDecoderControl -*/ - -/*! - Destroys an audio decoder control. -*/ -QAudioDecoderControl::~QAudioDecoderControl() -{ -} - -/*! - Constructs a new audio decoder control with the given \a parent. -*/ -QAudioDecoderControl::QAudioDecoderControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, 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 6ab27ba62..000000000 --- a/src/multimedia/controls/qaudiodecodercontrol.h +++ /dev/null @@ -1,103 +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/qmediacontrol.h> -#include <QtMultimedia/qaudiodecoder.h> - -#include <QtCore/qpair.h> - -#include <QtMultimedia/qaudiobuffer.h> - -QT_BEGIN_NAMESPACE - -class QIODevice; -class Q_MULTIMEDIA_EXPORT QAudioDecoderControl : public QMediaControl -{ - Q_OBJECT - -public: - ~QAudioDecoderControl(); - - 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); -}; - -#define QAudioDecoderControl_iid "org.qt-project.qt.audiodecodercontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QAudioDecoderControl, QAudioDecoderControl_iid) - -QT_END_NAMESPACE - -#endif // QAUDIODECODERCONTROL_H diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.cpp b/src/multimedia/controls/qaudioencodersettingscontrol.cpp deleted file mode 100644 index 5ae473178..000000000 --- a/src/multimedia/controls/qaudioencodersettingscontrol.cpp +++ /dev/null @@ -1,140 +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 "qaudioencodersettingscontrol.h" -#include <QtCore/qstringlist.h> - -QT_BEGIN_NAMESPACE - - -/*! - \class QAudioEncoderSettingsControl - \obsolete - \inmodule QtMultimedia - - \ingroup multimedia_control - - \brief The QAudioEncoderSettingsControl class provides access to the settings of a - media service that performs audio encoding. - - If a QMediaService supports encoding audio data it will implement - QAudioEncoderSettingsControl. This control provides information about the limits - of restricted audio encoder options and allows the selection of a set of - audio encoder settings as specified in a QAudioEncoderSettings object. - - The functionality provided by this control is exposed to application code through the - QMediaRecorder class. - - The interface name of QAudioEncoderSettingsControl is \c org.qt-project.qt.audioencodersettingscontrol/5.0 as - defined in QAudioEncoderSettingsControl_iid. - - \sa QMediaService::requestControl(), QMediaRecorder -*/ - -/*! - \macro QAudioEncoderSettingsControl_iid - - \c org.qt-project.qt.audioencodersettingscontrol/5.0 - - Defines the interface name of the QAudioEncoderSettingsControl class. - - \relates QAudioEncoderSettingsControl -*/ - -/*! - Create a new audio encoder settings control object with the given \a parent. -*/ -QAudioEncoderSettingsControl::QAudioEncoderSettingsControl(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys the audio encoder settings control. -*/ -QAudioEncoderSettingsControl::~QAudioEncoderSettingsControl() -{ -} - -/*! - \fn QAudioEncoderSettingsControl::supportedAudioCodecs() const - - Returns the list of supported audio codec names. -*/ - -/*! - \fn QAudioEncoderSettingsControl::codecDescription(const QString &codecName) const - - Returns the description of audio codec \a codecName. -*/ - -/*! - \fn QAudioEncoderSettingsControl::supportedSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(), - bool *continuous) const - - Returns the list of supported audio sample rates, if known. - - If non null audio \a settings parameter is passed, - the returned list is reduced to sample rates supported with partial settings applied. - - It can be used for example to query the list of sample rates, supported by specific audio codec. - - If the encoder supports arbitrary sample rates within the supported rates range, - *\a continuous is set to true, otherwise *\a continuous is set to false. -*/ - -/*! - \fn QAudioEncoderSettingsControl::audioSettings() const - - Returns the audio encoder settings. - - The returned value may be different tha passed to QAudioEncoderSettingsControl::setAudioSettings() - if the settings contains the default or undefined parameters. - In this case if the undefined parameters are already resolved, they should be returned. -*/ - -/*! - \fn QAudioEncoderSettingsControl::setAudioSettings(const QAudioEncoderSettings &settings) - - Sets the selected audio \a settings. -*/ - -QT_END_NAMESPACE - -#include "moc_qaudioencodersettingscontrol.cpp" diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.h b/src/multimedia/controls/qaudioencodersettingscontrol.h deleted file mode 100644 index b4c3abafd..000000000 --- a/src/multimedia/controls/qaudioencodersettingscontrol.h +++ /dev/null @@ -1,84 +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 QAUDIOENCODERSETTINGSCONTROL_H -#define QAUDIOENCODERSETTINGSCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediarecorder.h> -#include <QtCore/qlist.h> -#include <QtCore/qpair.h> - -QT_BEGIN_NAMESPACE - -class QAudioFormat; -QT_END_NAMESPACE - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QAudioEncoderSettingsControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QAudioEncoderSettingsControl(); - - virtual QStringList supportedAudioCodecs() const = 0; - virtual QString codecDescription(const QString &codecName) const = 0; - - virtual QList<int> supportedSampleRates(const QAudioEncoderSettings &settings, - bool *continuous = nullptr) const = 0; - - virtual QAudioEncoderSettings audioSettings() const = 0; - virtual void setAudioSettings(const QAudioEncoderSettings &settings) = 0; - -protected: - explicit QAudioEncoderSettingsControl(QObject *parent = nullptr); -}; - -#define QAudioEncoderSettingsControl_iid "org.qt-project.qt.audioencodersettingscontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QAudioEncoderSettingsControl, QAudioEncoderSettingsControl_iid) - -QT_END_NAMESPACE - - -#endif // QAUDIOENCODERSETTINGSCONTROL_H diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.cpp b/src/multimedia/controls/qaudioinputselectorcontrol.cpp deleted file mode 100644 index 649891225..000000000 --- a/src/multimedia/controls/qaudioinputselectorcontrol.cpp +++ /dev/null @@ -1,131 +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 "qaudioinputselectorcontrol.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QAudioInputSelectorControl - \obsolete - - \brief The QAudioInputSelectorControl class provides an audio input selector media control. - \inmodule QtMultimedia - \ingroup multimedia_control - - The QAudioInputSelectorControl class provides descriptions of the audio - inputs available on a system and allows one to be selected as the audio - input of a media service. - - The interface name of QAudioInputSelectorControl is \c org.qt-project.qt.audioinputselectorcontrol/5.0 as - defined in QAudioInputSelectorControl_iid. - - \sa QMediaService::requestControl() -*/ - -/*! - \macro QAudioInputSelectorControl_iid - - \c org.qt-project.qt.audioinputselectorcontrol/5.0 - - Defines the interface name of the QAudioInputSelectorControl class. - - \relates QAudioInputSelectorControl -*/ - -/*! - Constructs a new audio input selector control with the given \a parent. -*/ -QAudioInputSelectorControl::QAudioInputSelectorControl(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys an audio input selector control. -*/ -QAudioInputSelectorControl::~QAudioInputSelectorControl() -{ -} - -/*! - \fn QList<QString> QAudioInputSelectorControl::availableInputs() const - - Returns a list of the names of the available audio inputs. -*/ - -/*! - \fn QString QAudioInputSelectorControl::inputDescription(const QString& name) const - - Returns the description of the input \a name. -*/ - -/*! - \fn QString QAudioInputSelectorControl::defaultInput() const - - Returns the name of the default audio input. -*/ - -/*! - \fn QString QAudioInputSelectorControl::activeInput() const - - Returns the name of the currently selected audio input. -*/ - -/*! - \fn QAudioInputSelectorControl::setActiveInput(const QString& name) - - Set the active audio input to \a name. -*/ - -/*! - \fn QAudioInputSelectorControl::activeInputChanged(const QString& name) - - Signals that the audio input has changed to \a name. -*/ - -/*! - \fn QAudioInputSelectorControl::availableInputsChanged() - - Signals that list of available inputs has changed. -*/ - -QT_END_NAMESPACE - -#include "moc_qaudioinputselectorcontrol.cpp" diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.h b/src/multimedia/controls/qaudioinputselectorcontrol.h deleted file mode 100644 index 9665b55de..000000000 --- a/src/multimedia/controls/qaudioinputselectorcontrol.h +++ /dev/null @@ -1,80 +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 QAUDIOINPUTSELECTORCONTROL_H -#define QAUDIOINPUTSELECTORCONTROL_H - -#include <QtMultimedia/qaudio.h> -#include <QtMultimedia/qmediacontrol.h> - -QT_BEGIN_NAMESPACE - - -// Class forward declaration required for QDoc bug -class QString; -class Q_MULTIMEDIA_EXPORT QAudioInputSelectorControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QAudioInputSelectorControl(); - - virtual QList<QString> availableInputs() const = 0; - virtual QString inputDescription(const QString& name) const = 0; - virtual QString defaultInput() const = 0; - virtual QString activeInput() const = 0; - -public Q_SLOTS: - virtual void setActiveInput(const QString& name) = 0; - -Q_SIGNALS: - void activeInputChanged(const QString& name); - void availableInputsChanged(); - -protected: - explicit QAudioInputSelectorControl(QObject *parent = nullptr); -}; - -#define QAudioInputSelectorControl_iid "org.qt-project.qt.audioinputselectorcontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QAudioInputSelectorControl, QAudioInputSelectorControl_iid) - -QT_END_NAMESPACE - - -#endif // QAUDIOINPUTSELECTORCONTROL_H diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp b/src/multimedia/controls/qaudiooutputselectorcontrol.cpp deleted file mode 100644 index 64886e4c9..000000000 --- a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp +++ /dev/null @@ -1,131 +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 "qaudiooutputselectorcontrol.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QAudioOutputSelectorControl - \obsolete - - \brief The QAudioOutputSelectorControl class provides an audio output selector media control. - \inmodule QtMultimedia - \ingroup multimedia_control - - The QAudioOutputSelectorControl class provides descriptions of the audio - outputs available on a system and allows one to be selected as the audio - output of a media service. - - The interface name of QAudioOutputSelectorControl is \c org.qt-project.qt.audiooutputselectorcontrol/5.0 as - defined in QAudioOutputSelectorControl_iid. - - \sa QMediaService::requestControl() -*/ - -/*! - \macro QAudioOutputSelectorControl_iid - - \c org.qt-project.qt.audiooutputselectorcontrol/5.0 - - Defines the interface name of the QAudioOutputSelectorControl class. - - \relates QAudioOutputSelectorControl -*/ - -/*! - Constructs a new audio output selector control with the given \a parent. -*/ -QAudioOutputSelectorControl::QAudioOutputSelectorControl(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys an audio output selector control. -*/ -QAudioOutputSelectorControl::~QAudioOutputSelectorControl() -{ -} - -/*! - \fn QList<QString> QAudioOutputSelectorControl::availableOutputs() const - - Returns a list of the names of the available audio outputs. -*/ - -/*! - \fn QString QAudioOutputSelectorControl::outputDescription(const QString& name) const - - Returns the description of the output \a name. -*/ - -/*! - \fn QString QAudioOutputSelectorControl::defaultOutput() const - - Returns the name of the default audio output. -*/ - -/*! - \fn QString QAudioOutputSelectorControl::activeOutput() const - - Returns the name of the currently selected audio output. -*/ - -/*! - \fn QAudioOutputSelectorControl::setActiveOutput(const QString& name) - - Set the active audio output to \a name. -*/ - -/*! - \fn QAudioOutputSelectorControl::activeOutputChanged(const QString& name) - - Signals that the audio output has changed to \a name. -*/ - -/*! - \fn QAudioOutputSelectorControl::availableOutputsChanged() - - Signals that list of available outputs has changed. -*/ - -QT_END_NAMESPACE - -#include "moc_qaudiooutputselectorcontrol.cpp" diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.h b/src/multimedia/controls/qaudiooutputselectorcontrol.h deleted file mode 100644 index de44d0ebb..000000000 --- a/src/multimedia/controls/qaudiooutputselectorcontrol.h +++ /dev/null @@ -1,80 +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 QAUDIOOUTPUTSELECTORCONTROL_H -#define QAUDIOOUTPUTSELECTORCONTROL_H - -#include <QtMultimedia/qaudio.h> -#include <QtMultimedia/qmediacontrol.h> - -QT_BEGIN_NAMESPACE - - -// Class forward declaration required for QDoc bug -class QString; -class Q_MULTIMEDIA_EXPORT QAudioOutputSelectorControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QAudioOutputSelectorControl(); - - virtual QList<QString> availableOutputs() const = 0; - virtual QString outputDescription(const QString& name) const = 0; - virtual QString defaultOutput() const = 0; - virtual QString activeOutput() const = 0; - -public Q_SLOTS: - virtual void setActiveOutput(const QString& name) = 0; - -Q_SIGNALS: - void activeOutputChanged(const QString& name); - void availableOutputsChanged(); - -protected: - explicit QAudioOutputSelectorControl(QObject *parent = nullptr); -}; - -#define QAudioOutputSelectorControl_iid "org.qt-project.qt.audiooutputselectorcontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QAudioOutputSelectorControl, QAudioOutputSelectorControl_iid) - -QT_END_NAMESPACE - - -#endif // QAUDIOOUTPUTSELECTORCONTROL_H diff --git a/src/multimedia/controls/qaudiorolecontrol.cpp b/src/multimedia/controls/qaudiorolecontrol.cpp deleted file mode 100644 index 01e60a914..000000000 --- a/src/multimedia/controls/qaudiorolecontrol.cpp +++ /dev/null @@ -1,118 +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 "qmediacontrol_p.h" -#include "qaudiorolecontrol.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QAudioRoleControl - \obsolete - \inmodule QtMultimedia - \ingroup multimedia_control - \since 5.6 - - \brief The QAudioRoleControl class provides control over the audio role of a media object. - - If a QMediaService supports audio roles it will implement QAudioRoleControl. - - The functionality provided by this control is exposed to application code through the - QMediaPlayer class. - - The interface name of QAudioRoleControl is \c org.qt-project.qt.audiorolecontrol/5.6 as - defined in QAudioRoleControl_iid. - - \sa QMediaService::requestControl(), QMediaPlayer -*/ - -/*! - \macro QAudioRoleControl_iid - - \c org.qt-project.qt.audiorolecontrol/5.6 - - Defines the interface name of the QAudioRoleControl class. - - \relates QAudioRoleControl -*/ - -/*! - Construct a QAudioRoleControl with the given \a parent. -*/ -QAudioRoleControl::QAudioRoleControl(QObject *parent) - : QMediaControl(*new QMediaControlPrivate, parent) -{ - -} - -/*! - Destroys the audio role control. -*/ -QAudioRoleControl::~QAudioRoleControl() -{ - -} - -/*! - \fn QAudio::Role QAudioRoleControl::audioRole() const - - Returns the audio role of the media played by the media service. -*/ - -/*! - \fn void QAudioRoleControl::setAudioRole(QAudio::Role role) - - Sets the audio \a role of the media played by the media service. -*/ - -/*! - \fn QList<QAudio::Role> QAudioRoleControl::supportedAudioRoles() const - - Returns a list of audio roles that the media service supports. -*/ - -/*! - \fn void QAudioRoleControl::audioRoleChanged(QAudio::Role role) - - Signal emitted when the audio \a role has changed. - */ - -QT_END_NAMESPACE - -#include "moc_qaudiorolecontrol.cpp" diff --git a/src/multimedia/controls/qaudiorolecontrol.h b/src/multimedia/controls/qaudiorolecontrol.h deleted file mode 100644 index c59874fdf..000000000 --- a/src/multimedia/controls/qaudiorolecontrol.h +++ /dev/null @@ -1,75 +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 QAUDIOROLECONTROL_H -#define QAUDIOROLECONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qaudio.h> - -QT_BEGIN_NAMESPACE - -// Class forward declaration required for QDoc bug -class QString; - -class Q_MULTIMEDIA_EXPORT QAudioRoleControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QAudioRoleControl(); - - virtual QAudio::Role audioRole() const = 0; - virtual void setAudioRole(QAudio::Role role) = 0; - - virtual QList<QAudio::Role> supportedAudioRoles() const = 0; - -Q_SIGNALS: - void audioRoleChanged(QAudio::Role role); - -protected: - explicit QAudioRoleControl(QObject *parent = nullptr); -}; - -#define QAudioRoleControl_iid "org.qt-project.qt.audiorolecontrol/5.6" -Q_MEDIA_DECLARE_CONTROL(QAudioRoleControl, QAudioRoleControl_iid) - -QT_END_NAMESPACE - -#endif // QAUDIOROLECONTROL_H diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp deleted file mode 100644 index 8f0c3e6e9..000000000 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp +++ /dev/null @@ -1,113 +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 <qcameracapturebufferformatcontrol.h> - -QT_BEGIN_NAMESPACE - -/*! - \class QCameraCaptureBufferFormatControl - \obsolete - - \brief The QCameraCaptureBufferFormatControl class provides a control for setting the capture buffer format. - - The format is of type QVideoFrame::PixelFormat. - - \inmodule QtMultimedia - - \ingroup multimedia_control - - The interface name of QCameraCaptureBufferFormatControl is \c org.qt-project.qt.cameracapturebufferformatcontrol/5.0 as - defined in QCameraCaptureBufferFormatControl_iid. - - \sa QMediaService::requestControl() -*/ - -/*! - \macro QCameraCaptureBufferFormatControl_iid - - \c org.qt-project.qt.cameracapturebufferformatcontrol/5.0 - - Defines the interface name of the QCameraCaptureBufferFormatControl class. - - \relates QCameraCaptureBufferFormatControl -*/ - -/*! - Constructs a new image buffer capture format control object with the given \a parent -*/ -QCameraCaptureBufferFormatControl::QCameraCaptureBufferFormatControl(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys an image buffer capture format control. -*/ -QCameraCaptureBufferFormatControl::~QCameraCaptureBufferFormatControl() -{ -} - -/*! - \fn QCameraCaptureBufferFormatControl::supportedBufferFormats() const - - Returns the list of the supported buffer capture formats. -*/ - -/*! - \fn QCameraCaptureBufferFormatControl::bufferFormat() const - - Returns the current buffer capture format. -*/ - -/*! - \fn QCameraCaptureBufferFormatControl::setBufferFormat(QVideoFrame::PixelFormat format) - - Sets the buffer capture \a format. -*/ - -/*! - \fn QCameraCaptureBufferFormatControl::bufferFormatChanged(QVideoFrame::PixelFormat format) - - Signals the buffer image capture format changed to \a format. -*/ - -QT_END_NAMESPACE - -#include "moc_qcameracapturebufferformatcontrol.cpp" diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.h b/src/multimedia/controls/qcameracapturebufferformatcontrol.h deleted file mode 100644 index 1c8f44243..000000000 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.h +++ /dev/null @@ -1,75 +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 QCAMERACAPTUREBUFFERFORMATCONTROL_H -#define QCAMERACAPTUREBUFFERFORMATCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qcameraimagecapture.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraCaptureBufferFormatControl : public QMediaControl -{ - Q_OBJECT -public: - ~QCameraCaptureBufferFormatControl(); - - virtual QList<QVideoFrame::PixelFormat> supportedBufferFormats() const = 0; - virtual QVideoFrame::PixelFormat bufferFormat() const = 0; - virtual void setBufferFormat(QVideoFrame::PixelFormat format) = 0; - -Q_SIGNALS: - void bufferFormatChanged(QVideoFrame::PixelFormat format); - -protected: - explicit QCameraCaptureBufferFormatControl(QObject *parent = nullptr); -}; - -#define QCameraCaptureBufferFormatControl_iid "org.qt-project.qt.cameracapturebufferformatcontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QCameraCaptureBufferFormatControl, QCameraCaptureBufferFormatControl_iid) - -QT_END_NAMESPACE - - -#endif - diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp deleted file mode 100644 index a9a54a3b8..000000000 --- a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp +++ /dev/null @@ -1,115 +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 <qcameracapturedestinationcontrol.h> -#include <QtCore/qstringlist.h> - -QT_BEGIN_NAMESPACE - -/*! - \class QCameraCaptureDestinationControl - \obsolete - - \brief The QCameraCaptureDestinationControl class provides a control for setting capture destination. - - Depending on backend capabilities capture to file, buffer or both can be supported. - - \inmodule QtMultimedia - - \ingroup multimedia_control - - The interface name of QCameraCaptureDestinationControl is \c org.qt-project.qt.cameracapturedestinationcontrol/5.0 as - defined in QCameraCaptureDestinationControl_iid. - - - \sa QMediaService::requestControl() -*/ - -/*! - \macro QCameraCaptureDestinationControl_iid - - \c org.qt-project.qt.cameracapturedestinationcontrol/5.0 - - Defines the interface name of the QCameraCaptureDestinationControl class. - - \relates QCameraCaptureDestinationControl -*/ - -/*! - Constructs a new image capture destination control object with the given \a parent -*/ -QCameraCaptureDestinationControl::QCameraCaptureDestinationControl(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys an image capture destination control. -*/ -QCameraCaptureDestinationControl::~QCameraCaptureDestinationControl() -{ -} - -/*! - \fn QCameraCaptureDestinationControl::isCaptureDestinationSupported(QCameraImageCapture::CaptureDestinations destination) const - - Returns true if the capture \a destination is supported; and false if it is not. -*/ - -/*! - \fn QCameraCaptureDestinationControl::captureDestination() const - - Returns the current capture destination. The default destination is QCameraImageCapture::CaptureToFile. -*/ - -/*! - \fn QCameraCaptureDestinationControl::setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) - - Sets the capture \a destination. -*/ - -/*! - \fn QCameraCaptureDestinationControl::captureDestinationChanged(QCameraImageCapture::CaptureDestinations destination) - - Signals the image capture \a destination changed. -*/ - -QT_END_NAMESPACE - -#include "moc_qcameracapturedestinationcontrol.cpp" diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.h b/src/multimedia/controls/qcameracapturedestinationcontrol.h deleted file mode 100644 index 395f8c511..000000000 --- a/src/multimedia/controls/qcameracapturedestinationcontrol.h +++ /dev/null @@ -1,75 +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 QCAMERACAPTUREDESTINATIONCONTROL_H -#define QCAMERACAPTUREDESTINATIONCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qcameraimagecapture.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraCaptureDestinationControl : public QMediaControl -{ - Q_OBJECT -public: - ~QCameraCaptureDestinationControl(); - - virtual bool isCaptureDestinationSupported(QCameraImageCapture::CaptureDestinations destination) const = 0; - virtual QCameraImageCapture::CaptureDestinations captureDestination() const = 0; - virtual void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) = 0; - -Q_SIGNALS: - void captureDestinationChanged(QCameraImageCapture::CaptureDestinations destination); - -protected: - explicit QCameraCaptureDestinationControl(QObject *parent = nullptr); -}; - -#define QCameraCaptureDestinationControl_iid "org.qt-project.qt.cameracapturedestinationcontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QCameraCaptureDestinationControl, QCameraCaptureDestinationControl_iid) - -QT_END_NAMESPACE - - -#endif - diff --git a/src/multimedia/controls/qcameracontrol.cpp b/src/multimedia/controls/qcameracontrol.cpp deleted file mode 100644 index d33fa94c9..000000000 --- a/src/multimedia/controls/qcameracontrol.cpp +++ /dev/null @@ -1,205 +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> -#include "qmediacontrol_p.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 - - This service is provided by a QMediaService object via - QMediaService::control(). It is used by QCamera. - - The interface name of QCameraControl is \c org.qt-project.qt.cameracontrol/5.0 as - defined in QCameraControl_iid. - - - - \sa QMediaService::requestControl(), QCamera -*/ - -/*! - \macro QCameraControl_iid - - \c org.qt-project.qt.cameracontrol/5.0 - - Defines the interface name of the QCameraControl class. - - \relates QCameraControl -*/ - -/*! - Constructs a camera control object with \a parent. -*/ - -QCameraControl::QCameraControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destruct the camera control object. -*/ - -QCameraControl::~QCameraControl() -{ -} - -/*! - \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 Camera::CaptureModes QCameraControl::captureMode() const = 0 - - Returns the current capture mode. -*/ - -/*! - \fn void QCameraControl::setCaptureMode(QCamera::CaptureModes mode) = 0; - - Sets the current capture \a mode. - - The capture mode changes are synchronous and allowed in any camera state. - - If the capture mode is changed while camera is active, - it's recommended to change status to QCamera::LoadedStatus - and start activating the camera in the next event loop - with the status changed to QCamera::StartingStatus. - This allows the capture settings to be applied before camera is started. - Than change the status to QCamera::StartedStatus when the capture mode change is done. -*/ - -/*! - \fn bool QCameraControl::isCaptureModeSupported(QCamera::CaptureModes mode) const = 0; - - Returns true if the capture \a mode is suported. -*/ - -/*! - \fn QCameraControl::captureModeChanged(QCamera::CaptureModes mode) - - Signal emitted when the camera capture \a mode changes. - */ - -/*! - \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. -*/ - -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 6c5163118..000000000 --- a/src/multimedia/controls/qcameracontrol.h +++ /dev/null @@ -1,96 +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 <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaobject.h> - -#include <QtMultimedia/qcamera.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraControl : public QMediaControl -{ - Q_OBJECT - -public: - enum PropertyChangeType { - CaptureMode = 1, - ImageEncodingSettings = 2, - VideoEncodingSettings = 3, - Viewfinder = 4, - ViewfinderSettings = 5 - }; - - ~QCameraControl(); - - virtual QCamera::State state() const = 0; - virtual void setState(QCamera::State state) = 0; - - virtual QCamera::Status status() const = 0; - - virtual QCamera::CaptureModes captureMode() const = 0; - virtual void setCaptureMode(QCamera::CaptureModes) = 0; - virtual bool isCaptureModeSupported(QCamera::CaptureModes mode) const = 0; - - virtual bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const = 0; - -Q_SIGNALS: - void stateChanged(QCamera::State); - void statusChanged(QCamera::Status); - void error(int error, const QString &errorString); - void captureModeChanged(QCamera::CaptureModes mode); - -protected: - explicit QCameraControl(QObject *parent = nullptr); -}; - -#define QCameraControl_iid "org.qt-project.qt.cameracontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QCameraControl, QCameraControl_iid) - -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 2095c9cfa..000000000 --- a/src/multimedia/controls/qcameraexposurecontrol.cpp +++ /dev/null @@ -1,207 +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> -#include "qmediacontrol_p.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. - - The interface name of QCameraExposureControl is \c org.qt-project.qt.cameraexposurecontrol/5.0 as - defined in QCameraExposureControl_iid. - - \sa QCameraExposure, QCamera -*/ - -/*! - \macro QCameraExposureControl_iid - - \c org.qt-project.qt.cameraexposurecontrol/5.0 - - Defines the interface name of the QCameraExposureControl class. - - \relates QCameraExposureControl -*/ - -/*! - Constructs a camera exposure control object with \a parent. -*/ -QCameraExposureControl::QCameraExposureControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destroys the camera exposure control object. -*/ -QCameraExposureControl::~QCameraExposureControl() -{ -} - -/*! - \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 FlashPower - Manual flash power, specified as qreal value. - Accepted power range is [0..1.0], - with 0 value means no flash and 1.0 corresponds to full flash power. - - This value is only used in the \l{QCameraExposure::FlashManual}{manual flash mode}. - \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 FlashCompensation - Flash compensation, specified as qreal EV value. - \value SpotMeteringPoint - The relative frame coordinate of the point to use for exposure metering - in spot metering mode, specified as a QPointF. - \value ExposureMode - Camera exposure mode. - \value MeteringMode - Camera metering mode. - \value ExtendedExposureParameter - The base value for platform specific extended parameters. - For such parameters the sequential values starting from ExtendedExposureParameter should be used. -*/ - -/*! - \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 7694380e5..000000000 --- a/src/multimedia/controls/qcameraexposurecontrol.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 QCAMERAEXPOSURECONTROL_H -#define QCAMERAEXPOSURECONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaobject.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 QMediaControl -{ - Q_OBJECT - Q_ENUMS(ExposureParameter) - -public: - ~QCameraExposureControl(); - - enum ExposureParameter { - ISO, - Aperture, - ShutterSpeed, - ExposureCompensation, - FlashPower, - FlashCompensation, - TorchPower, - SpotMeteringPoint, - ExposureMode, - MeteringMode, - ExtendedExposureParameter = 1000 - }; - - 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; - -Q_SIGNALS: - void requestedValueChanged(int parameter); - void actualValueChanged(int parameter); - void parameterRangeChanged(int parameter); - -protected: - explicit QCameraExposureControl(QObject *parent = nullptr); -}; - -#define QCameraExposureControl_iid "org.qt-project.qt.cameraexposurecontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QCameraExposureControl, QCameraExposureControl_iid) - -QT_END_NAMESPACE - -Q_DECLARE_METATYPE(QCameraExposureControl::ExposureParameter) - -Q_MEDIA_ENUM_DEBUG(QCameraExposureControl, ExposureParameter) - - -#endif // QCAMERAEXPOSURECONTROL_H - diff --git a/src/multimedia/controls/qcamerafeedbackcontrol.cpp b/src/multimedia/controls/qcamerafeedbackcontrol.cpp deleted file mode 100644 index 42cd7d661..000000000 --- a/src/multimedia/controls/qcamerafeedbackcontrol.cpp +++ /dev/null @@ -1,182 +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 "qcamerafeedbackcontrol.h" -#include <private/qmediacontrol_p.h> - -/*! - \class QCameraFeedbackControl - \obsolete - - \brief The QCameraFeedbackControl class allows controlling feedback (sounds etc) during camera operation. - - \inmodule QtMultimedia - - \ingroup multimedia_control - \since 5.0 - - When using a camera, there are several times when some form of feedback to - the user is given - for example, when an image is taken, or when recording is started. - You can enable or disable some of this feedback, or adjust what sound might be played - for these actions. - - In some cases it may be undesirable to play a sound effect - for example, when initiating - video recording the sound itself may be recorded. - - \note In some countries or regions, feedback sounds or other indications (e.g. a red light) are - mandatory during camera operation. In these cases, you can check \c isEventFeedbackLocked to check - if that type of feedback can be modified. Any attempts to change a locked feedback type will be - ignored. - - The interface name of QCameraFeedbackControl is \c org.qt-project.qt.camerafeedbackcontrol/5.0 as - defined in QCameraFeedbackControl_iid. - - \sa QCamera -*/ - -/*! - \enum QCameraFeedbackControl::EventType - - This enumeration describes certain events that occur during camera usage. You - can associate some form of feedback to be given when the event occurs, or check - whether feedback for this event is enabled or locked so that changes cannot be made. - - - - \value ViewfinderStarted The viewfinder stream was started (even if not visible) - \value ViewfinderStopped The viewfinder stream was stopped - \value ImageCaptured An image was captured but not yet fully processed - \value ImageSaved An image is fully available and saved somewhere. - \value ImageError An error occurred while capturing an image - \value RecordingStarted Video recording has started - \value RecordingInProgress Video recording is in progress - \value RecordingStopped Video recording has stopped - \value AutoFocusInProgress The camera is trying to automatically focus - \value AutoFocusLocked The camera has automatically focused successfully - \value AutoFocusFailed The camera was unable to focus automatically -*/ - -/*! - \macro QCameraFeedbackControl_iid - - \c org.qt-project.qt.camerafeedbackcontrol/5.0 - - Defines the interface name of the QCameraFeedbackControl class. - - \relates QCameraFeedbackControl -*/ - -/*! - Constructs a camera feedback control object with \a parent. -*/ -QCameraFeedbackControl::QCameraFeedbackControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destroys the camera feedback control object. -*/ -QCameraFeedbackControl::~QCameraFeedbackControl() -{ -} - -/*! - \fn bool QCameraFeedbackControl::isEventFeedbackLocked(EventType event) const - - Returns true if the feedback setting for \a event is locked. This may be true - because of legal compliance issues, or because configurability of this event's - feedback is not supported. - - \since 5.0 -*/ - -/*! - \fn bool QCameraFeedbackControl::isEventFeedbackEnabled(EventType event) const - - Returns true if the feedback for \a event is enabled. - - \since 5.0 -*/ - -/*! - \fn bool QCameraFeedbackControl::setEventFeedbackEnabled(EventType event, bool enabled) - - Turns on feedback for the specific \a event if \a enabled is true, otherwise disables the - feedback. Returns true if the feedback could be modified, or false otherwise (e.g. this feedback - type is locked). - - \since 5.0 -*/ - - -/*! - \fn void QCameraFeedbackControl::resetEventFeedback(EventType event) - - Restores the feedback setting for this \a event to its default setting. - - \since 5.0 -*/ - -/*! - \fn bool QCameraFeedbackControl::setEventFeedbackSound(EventType event, const QString &filePath) - - When the given \a event occurs, the sound effect referenced by \a filePath - will be played instead of the default sound. - - If this feedback type is locked, or if the supplied path is inaccessible, - this function will return false. In addition, some forms of feedback may - be non-auditory (e.g. a red light, or a vibration), and false may be - returned in this case. - - The file referenced should be linear PCM (WAV format). - - \note In the case that a valid file path to an unsupported file is given, this - function will return true but the feedback will use the original setting. - - \since 5.0 -*/ - - - - - - diff --git a/src/multimedia/controls/qcamerafeedbackcontrol.h b/src/multimedia/controls/qcamerafeedbackcontrol.h deleted file mode 100644 index 195ad3915..000000000 --- a/src/multimedia/controls/qcamerafeedbackcontrol.h +++ /dev/null @@ -1,96 +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 QCAMERAFEEDBACKCONTROL_H -#define QCAMERAFEEDBACKCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaobject.h> - -#include <QtMultimedia/qcamera.h> -#include <QtMultimedia/qmediaenumdebug.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraFeedbackControl : public QMediaControl -{ - Q_OBJECT - -public: - enum EventType { - ViewfinderStarted = 1, - ViewfinderStopped, - ImageCaptured, - ImageSaved, - ImageError, - RecordingStarted, - RecordingInProgress, - RecordingStopped, - AutoFocusInProgress, - AutoFocusLocked, - AutoFocusFailed - }; - - ~QCameraFeedbackControl(); - - virtual bool isEventFeedbackLocked(EventType) const = 0; - - virtual bool isEventFeedbackEnabled(EventType) const = 0; - - virtual bool setEventFeedbackEnabled(EventType, bool) = 0; - virtual void resetEventFeedback(EventType) = 0; - - virtual bool setEventFeedbackSound(EventType, const QString &filePath) = 0; - -protected: - explicit QCameraFeedbackControl(QObject *parent = nullptr); -}; - -#define QCameraFeedbackControl_iid "org.qt-project.qt.camerafeedbackcontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QCameraFeedbackControl, QCameraFeedbackControl_iid) - -QT_END_NAMESPACE - - -#endif // QCAMERAFEEDBACKCONTROL_H diff --git a/src/multimedia/controls/qcameraflashcontrol.cpp b/src/multimedia/controls/qcameraflashcontrol.cpp deleted file mode 100644 index 658e2d56c..000000000 --- a/src/multimedia/controls/qcameraflashcontrol.cpp +++ /dev/null @@ -1,134 +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 <qcameraflashcontrol.h> -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QCameraFlashControl - \obsolete - - \brief The QCameraFlashControl class allows controlling a camera's flash. - - \inmodule QtMultimedia - - - \ingroup multimedia_control - - You can set the type of flash effect used when an image is captured, and test to see - if the flash hardware is ready to fire. - - You can retrieve this control from the camera object in the usual way: - - Some camera devices may not have flash hardware, or may not be configurable. In that - case, there will be no QCameraFlashControl available. - - The interface name of QCameraFlashControl is \c org.qt-project.qt.cameraflashcontrol/5.0 as - defined in QCameraFlashControl_iid. - - \sa QCamera -*/ - -/*! - \macro QCameraFlashControl_iid - - \c org.qt-project.qt.cameraflashcontrol/5.0 - - Defines the interface name of the QCameraFlashControl class. - - \relates QCameraFlashControl -*/ - -/*! - Constructs a camera flash control object with \a parent. -*/ -QCameraFlashControl::QCameraFlashControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destroys the camera control object. -*/ -QCameraFlashControl::~QCameraFlashControl() -{ -} - -/*! - \fn QCamera::FlashModes QCameraFlashControl::flashMode() const - - Returns the current flash mode. -*/ - -/*! - \fn void QCameraFlashControl::setFlashMode(QCameraExposure::FlashModes mode) - - Set the current flash \a mode. - - Usually a single QCameraExposure::FlashMode flag is used, - but some non conflicting flags combination are also allowed, - like QCameraExposure::FlashManual | QCameraExposure::FlashSlowSyncRearCurtain. -*/ - - -/*! - \fn QCameraFlashControl::isFlashModeSupported(QCameraExposure::FlashModes mode) const - - Return true if the reqested flash \a mode is supported. - Some QCameraExposure::FlashMode values can be combined, - for example QCameraExposure::FlashManual | QCameraExposure::FlashSlowSyncRearCurtain -*/ - -/*! - \fn bool QCameraFlashControl::isFlashReady() const - - Returns true if flash is charged. -*/ - -/*! - \fn void QCameraFlashControl::flashReady(bool ready) - - Signal emitted when flash state changes to \a ready. -*/ - -QT_END_NAMESPACE - -#include "moc_qcameraflashcontrol.cpp" diff --git a/src/multimedia/controls/qcameraflashcontrol.h b/src/multimedia/controls/qcameraflashcontrol.h deleted file mode 100644 index d4b7d1f4c..000000000 --- a/src/multimedia/controls/qcameraflashcontrol.h +++ /dev/null @@ -1,81 +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 QCAMERAFLASHCONTROL_H -#define QCAMERAFLASHCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaobject.h> - -#include <QtMultimedia/qcameraexposure.h> -#include <QtMultimedia/qcamera.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraFlashControl : public QMediaControl -{ - Q_OBJECT - -public: - ~QCameraFlashControl(); - - 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); - -protected: - explicit QCameraFlashControl(QObject *parent = nullptr); -}; - -#define QCameraFlashControl_iid "org.qt-project.qt.cameraflashcontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QCameraFlashControl, QCameraFlashControl_iid) - -QT_END_NAMESPACE - - -#endif // QCAMERAFLASHCONTROL_H - diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp deleted file mode 100644 index b216882b4..000000000 --- a/src/multimedia/controls/qcamerafocuscontrol.cpp +++ /dev/null @@ -1,198 +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> -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QCameraFocusControl - \obsolete - - - \brief The QCameraFocusControl class supplies control for - focusing related camera parameters. - - \inmodule QtMultimedia - - - \ingroup multimedia_control - - The interface name of QCameraFocusControl is \c org.qt-project.qt.camerafocuscontrol/5.0 as - defined in QCameraFocusControl_iid. - - - \sa QMediaService::requestControl(), QCamera -*/ - -/*! - \macro QCameraFocusControl_iid - - \c org.qt-project.qt.camerafocuscontrol/5.0 - - Defines the interface name of the QCameraFocusControl class. - - \relates QCameraFocusControl -*/ - -/*! - Constructs a camera control object with \a parent. -*/ - -QCameraFocusControl::QCameraFocusControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destruct the camera control object. -*/ - -QCameraFocusControl::~QCameraFocusControl() -{ -} - - -/*! - \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() -*/ - - - -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 a93d2fd1e..000000000 --- a/src/multimedia/controls/qcamerafocuscontrol.h +++ /dev/null @@ -1,90 +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 <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaobject.h> - -#include <QtMultimedia/qcamerafocus.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraFocusControl : public QMediaControl -{ - Q_OBJECT - -public: - ~QCameraFocusControl(); - - 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; - -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); -}; - -#define QCameraFocusControl_iid "org.qt-project.qt.camerafocuscontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QCameraFocusControl, QCameraFocusControl_iid) - -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 0e089d01b..000000000 --- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp +++ /dev/null @@ -1,195 +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 - - The interface name of QCameraImageCaptureControl is \c org.qt-project.qt.cameraimagecapturecontrol/5.0 as - defined in QCameraImageCaptureControl_iid. - - - \sa QMediaService::requestControl() -*/ - -/*! - \macro QCameraImageCaptureControl_iid - - \c org.qt-project.qt.cameraimagecapturecontrol/5.0 - - Defines the interface name of the QCameraImageCaptureControl class. - - \relates QCameraImageCaptureControl -*/ - -/*! - Constructs a new image capture control object with the given \a parent -*/ -QCameraImageCaptureControl::QCameraImageCaptureControl(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys an image capture control. -*/ -QCameraImageCaptureControl::~QCameraImageCaptureControl() -{ -} - -/*! - \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 QString &key, const QVariant &value) - - Signals that a metadata for an image with request \a id is available. Signal - also contains the \a key and \a value of the metadata. - - 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::driveMode() const - - Returns the current camera drive mode. -*/ - -/*! - \fn QCameraImageCaptureControl::setDriveMode(QCameraImageCapture::DriveMode mode) - - Sets the current camera drive \a mode. -*/ - - -/*! - \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 72b0abda3..000000000 --- a/src/multimedia/controls/qcameraimagecapturecontrol.h +++ /dev/null @@ -1,93 +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/qmediacontrol.h> -#include <QtMultimedia/qcameraimagecapture.h> - -QT_BEGIN_NAMESPACE - -class QImage; -QT_END_NAMESPACE - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraImageCaptureControl : public QMediaControl -{ - Q_OBJECT - -public: - ~QCameraImageCaptureControl(); - - virtual bool isReadyForCapture() const = 0; - - virtual QCameraImageCapture::DriveMode driveMode() const = 0; - virtual void setDriveMode(QCameraImageCapture::DriveMode mode) = 0; - - virtual int capture(const QString &fileName) = 0; - virtual void cancelCapture() = 0; - -Q_SIGNALS: - void readyForCaptureChanged(bool ready); - - void imageExposed(int requestId); - void imageCaptured(int requestId, const QImage &preview); - void imageMetadataAvailable(int id, const QString &key, const QVariant &value); - 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); -}; - -#define QCameraImageCaptureControl_iid "org.qt-project.qt.cameraimagecapturecontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QCameraImageCaptureControl, QCameraImageCaptureControl_iid) - -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 fba4bf400..000000000 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp +++ /dev/null @@ -1,189 +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> -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -static void qRegisterCameraImageProcessingControlMetaTypes() -{ - qRegisterMetaType<QCameraImageProcessingControl::ProcessingParameter>(); -} - -Q_CONSTRUCTOR_FUNCTION(qRegisterCameraImageProcessingControlMetaTypes) - -/*! - \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, sharpening and denoising. - - The interface name of QCameraImageProcessingControl is \c org.qt-project.qt.cameraimageprocessingcontrol/5.0 as - defined in QCameraImageProcessingControl_iid. - - 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. - - For example setting the SharpeningAdjustment parameter to -0.1 - slightly reduces the amount of sharpening applied, - while settings the Sharpening parameter to 0 disables sharpening at all. - - \sa QMediaService::requestControl(), QCamera -*/ - -/*! - \macro QCameraImageProcessingControl_iid - - \c org.qt-project.qt.cameraimageprocessingcontrol/5.0 - - Defines the interface name of the QCameraImageProcessingControl class. - - \relates QCameraImageProcessingControl -*/ - -/*! - Constructs an image processing control object with \a parent. -*/ - -QCameraImageProcessingControl::QCameraImageProcessingControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destruct the image processing control object. -*/ - -QCameraImageProcessingControl::~QCameraImageProcessingControl() -{ -} - -/*! - \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, Brightness, Sharpening and Denoising the value should be - in [0..1.0] range with invalid QVariant value indicating the default parameter value; - for ContrastAdjustment, SaturationAdjustment, BrightnessAdjustment, - SharpeningAdjustment and DenoisingAdjustment 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 Sharpening - Amount of sharpening applied. - \value Denoising - Amount of denoising applied. - \value ContrastAdjustment - Image contrast adjustment. - \value SaturationAdjustment - Image saturation adjustment. - \value BrightnessAdjustment - Image brightness adjustment. - \value SharpeningAdjustment - Adjustment of sharpening applied. - \value DenoisingAdjustment - Adjustment of denoising applied. - \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 8be435f8f..000000000 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.h +++ /dev/null @@ -1,98 +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 <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaobject.h> - -#include <QtMultimedia/qcamera.h> -#include <QtMultimedia/qmediaenumdebug.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraImageProcessingControl : public QMediaControl -{ - Q_OBJECT - Q_ENUMS(ProcessingParameter) - -public: - ~QCameraImageProcessingControl(); - - enum ProcessingParameter { - WhiteBalancePreset, - ColorTemperature, - Contrast, - Saturation, - Brightness, - Sharpening, - Denoising, - ContrastAdjustment, - SaturationAdjustment, - BrightnessAdjustment, - SharpeningAdjustment, - DenoisingAdjustment, - 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); -}; - -#define QCameraImageProcessingControl_iid "org.qt-project.qt.cameraimageprocessingcontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QCameraImageProcessingControl, QCameraImageProcessingControl_iid) - -QT_END_NAMESPACE - -Q_DECLARE_METATYPE(QCameraImageProcessingControl::ProcessingParameter) - -Q_MEDIA_ENUM_DEBUG(QCameraImageProcessingControl, ProcessingParameter) - -#endif - diff --git a/src/multimedia/controls/qcamerainfocontrol.cpp b/src/multimedia/controls/qcamerainfocontrol.cpp deleted file mode 100644 index 8a4ef3b44..000000000 --- a/src/multimedia/controls/qcamerainfocontrol.cpp +++ /dev/null @@ -1,103 +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 "qcamerainfocontrol.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QCameraInfoControl - \obsolete - \since 5.3 - - \brief The QCameraInfoControl class provides a camera info media control. - \inmodule QtMultimedia - - \ingroup multimedia_control - - The QCameraInfoControl class provides information about the camera devices - available on the system. - - The interface name of QCameraInfoControl is \c org.qt-project.qt.camerainfocontrol/5.3 as - defined in QCameraInfoControl_iid. -*/ - -/*! - \macro QCameraInfoControl_iid - - \c org.qt-project.qt.camerainfocontrol/5.3 - - Defines the interface name of the QCameraInfoControl class. - - \relates QVideoDeviceSelectorControl -*/ - -/*! - Constructs a camera info control with the given \a parent. -*/ -QCameraInfoControl::QCameraInfoControl(QObject *parent) - : QMediaControl(parent) -{ -} - -/*! - Destroys a camera info control. -*/ -QCameraInfoControl::~QCameraInfoControl() -{ -} - -/*! - \fn QCameraInfoControl::cameraPosition(const QString &deviceName) const - - Returns the physical position of the camera named \a deviceName on the hardware system. -*/ - -/*! - \fn QCameraInfoControl::cameraOrientation(const QString &deviceName) const - - Returns the physical orientation of the sensor for the camera named \a deviceName. - - The value is the orientation angle (clockwise, in steps of 90 degrees) of the camera sensor - in relation to the display in its natural orientation. -*/ - -QT_END_NAMESPACE - -#include "moc_qcamerainfocontrol.cpp" diff --git a/src/multimedia/controls/qcamerainfocontrol.h b/src/multimedia/controls/qcamerainfocontrol.h deleted file mode 100644 index 9ee0a3abf..000000000 --- a/src/multimedia/controls/qcamerainfocontrol.h +++ /dev/null @@ -1,69 +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 QCAMERAINFOCONTROL_H -#define QCAMERAINFOCONTROL_H - -#include <QtMultimedia/qcamera.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraInfoControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QCameraInfoControl(); - - virtual QCamera::Position cameraPosition(const QString &deviceName) const = 0; - virtual int cameraOrientation(const QString &deviceName) const = 0; - -protected: - explicit QCameraInfoControl(QObject *parent = nullptr); -}; - -#define QCameraInfoControl_iid "org.qt-project.qt.camerainfocontrol/5.3" -Q_MEDIA_DECLARE_CONTROL(QCameraInfoControl, QCameraInfoControl_iid) - -QT_END_NAMESPACE - -#endif // QCAMERAINFOCONTROL_H diff --git a/src/multimedia/controls/qcameralockscontrol.cpp b/src/multimedia/controls/qcameralockscontrol.cpp deleted file mode 100644 index 27b68cf2c..000000000 --- a/src/multimedia/controls/qcameralockscontrol.cpp +++ /dev/null @@ -1,128 +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 <qcameralockscontrol.h> -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QCameraLocksControl - \obsolete - - - - \brief The QCameraLocksControl class is an abstract base class for - classes that control still cameras or video cameras. - - \inmodule QtMultimedia - - - \ingroup multimedia_control - - This service is provided by a QMediaService object via - QMediaService::control(). It is used by QCamera. - - The interface name of QCameraLocksControl is \c org.qt-project.qt.cameralockscontrol/5.0 as - defined in QCameraLocksControl_iid. - - - \sa QMediaService::requestControl(), QCamera -*/ - -/*! - \macro QCameraLocksControl_iid - - \c org.qt-project.qt.cameralockscontrol/5.0 - - Defines the interface name of the QCameraLocksControl class. - - \relates QCameraLocksControl -*/ - -/*! - Constructs a camera locks control object with \a parent. -*/ - -QCameraLocksControl::QCameraLocksControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destruct the camera locks control object. -*/ - -QCameraLocksControl::~QCameraLocksControl() -{ -} - -/*! - \fn QCameraLocksControl::supportedLocks() const - - Returns the lock types, the camera supports. -*/ - -/*! - \fn QCameraLocksControl::lockStatus(QCamera::LockType lock) const - - Returns the camera \a lock status. -*/ - -/*! - \fn QCameraLocksControl::searchAndLock(QCamera::LockTypes locks) - - Request camera \a locks. -*/ - -/*! - \fn QCameraLocksControl::unlock(QCamera::LockTypes locks) - - Unlock camera \a locks. -*/ - -/*! - \fn QCameraLocksControl::lockStatusChanged(QCamera::LockType lock, QCamera::LockStatus status, QCamera::LockChangeReason reason) - - Signals the lock \a type \a status was changed with the specified \a reason. -*/ - -QT_END_NAMESPACE - -#include "moc_qcameralockscontrol.cpp" diff --git a/src/multimedia/controls/qcameralockscontrol.h b/src/multimedia/controls/qcameralockscontrol.h deleted file mode 100644 index d545d971e..000000000 --- a/src/multimedia/controls/qcameralockscontrol.h +++ /dev/null @@ -1,80 +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 QCAMERALOCKSCONTROL_H -#define QCAMERALOCKSCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaobject.h> - -#include <QtMultimedia/qcamera.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraLocksControl : public QMediaControl -{ - Q_OBJECT -public: - ~QCameraLocksControl(); - - virtual QCamera::LockTypes supportedLocks() const = 0; - - virtual QCamera::LockStatus lockStatus(QCamera::LockType lock) const = 0; - - virtual void searchAndLock(QCamera::LockTypes locks) = 0; - virtual void unlock(QCamera::LockTypes locks) = 0; - -Q_SIGNALS: - void lockStatusChanged(QCamera::LockType type, QCamera::LockStatus status, QCamera::LockChangeReason reason); - -protected: - explicit QCameraLocksControl(QObject *parent = nullptr); -}; - -#define QCameraLocksControl_iid "org.qt-project.qt.cameralockscontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QCameraLocksControl, QCameraLocksControl_iid) - -QT_END_NAMESPACE - - -#endif // QCAMERALOCKSCONTROL_H - diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp deleted file mode 100644 index bd5c7a73b..000000000 --- a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp +++ /dev/null @@ -1,206 +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 "qcameraviewfindersettingscontrol.h" -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QCameraViewfinderSettingsControl - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - - \brief The QCameraViewfinderSettingsControl class provides an abstract class - for controlling camera viewfinder parameters. - - The interface name of QCameraViewfinderSettingsControl is \c org.qt-project.qt.cameraviewfindersettingscontrol/5.0 as - defined in QCameraViewfinderSettingsControl_iid. - - \warning New backends should implement QCameraViewfinderSettingsControl2 instead. - Application developers should request this control only if QCameraViewfinderSettingsControl2 - is not available. - - \sa QMediaService::requestControl(), QCameraViewfinderSettingsControl2, QCamera -*/ - -/*! - \macro QCameraViewfinderSettingsControl_iid - - \c org.qt-project.qt.cameraviewfindersettingscontrol/5.0 - - Defines the interface name of the QCameraViewfinderSettingsControl class. - - \relates QCameraViewfinderSettingsControl -*/ - -/*! - Constructs a camera viewfinder control object with \a parent. -*/ -QCameraViewfinderSettingsControl::QCameraViewfinderSettingsControl(QObject *parent) - : QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destroys the camera viewfinder control object. -*/ -QCameraViewfinderSettingsControl::~QCameraViewfinderSettingsControl() -{ -} - -/*! - \enum QCameraViewfinderSettingsControl::ViewfinderParameter - \value Resolution - Viewfinder resolution, QSize. - \value PixelAspectRatio - Pixel aspect ratio, QSize as in QVideoSurfaceFormat::pixelAspectRatio - \value MinimumFrameRate - Minimum viewfinder frame rate, qreal - \value MaximumFrameRate - Maximum viewfinder frame rate, qreal - \value PixelFormat - Viewfinder pixel format, QVideoFrame::PixelFormat - \value UserParameter - The base value for platform specific extended parameters. - For such parameters the sequential values starting from UserParameter should be used. -*/ - -/*! - \fn bool QCameraViewfinderSettingsControl::isViewfinderParameterSupported(ViewfinderParameter parameter) const - - Returns true if configuration of viewfinder \a parameter is supported by camera backend. -*/ - -/*! - \fn QCameraViewfinderSettingsControl::viewfinderParameter(ViewfinderParameter parameter) const - - Returns the value of viewfinder \a parameter. -*/ - -/*! - \fn QCameraViewfinderSettingsControl::setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) - - Set the prefferred \a value of viewfinder \a parameter. - - Calling this while the camera is active may result in the camera being - stopped and reloaded. If video recording is in progress, this call may be ignored. - - If an unsupported parameter is specified the camera may fail to load, - or the setting may be ignored. - - Viewfinder parameters may also depend on other camera settings, - especially in video capture mode. If camera configuration conflicts - with viewfinder settings, the camara configuration is usually preferred. -*/ - - -/*! - \class QCameraViewfinderSettingsControl2 - \inmodule QtMultimedia - \ingroup multimedia_control - \since 5.5 - - \brief The QCameraViewfinderSettingsControl2 class provides access to the viewfinder settings - of a camera media service. - - The functionality provided by this control is exposed to application code through the QCamera class. - - The interface name of QCameraViewfinderSettingsControl2 is \c org.qt-project.qt.cameraviewfindersettingscontrol2/5.5 as - defined in QCameraViewfinderSettingsControl2_iid. - - \sa QMediaService::requestControl(), QCameraViewfinderSettings, QCamera -*/ - -/*! - \macro QCameraViewfinderSettingsControl2_iid - - \c org.qt-project.qt.cameraviewfindersettingscontrol2/5.5 - - Defines the interface name of the QCameraViewfinderSettingsControl2 class. - - \relates QCameraViewfinderSettingsControl2 -*/ - -/*! - Constructs a camera viewfinder settings control object with \a parent. -*/ -QCameraViewfinderSettingsControl2::QCameraViewfinderSettingsControl2(QObject *parent) - : QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destroys the camera viewfinder settings control object. -*/ -QCameraViewfinderSettingsControl2::~QCameraViewfinderSettingsControl2() -{ -} - -/*! - \fn QCameraViewfinderSettingsControl2::supportedViewfinderSettings() const - - Returns a list of supported camera viewfinder settings. - - The list is ordered by preference; preferred settings come first. -*/ - -/*! - \fn QCameraViewfinderSettingsControl2::viewfinderSettings() const - - Returns the viewfinder settings. - - If undefined or unsupported values are passed to QCameraViewfinderSettingsControl2::setViewfinderSettings(), - this function returns the actual settings used by the camera viewfinder. These may be available - only once the camera is active. -*/ - -/*! - \fn QCameraViewfinderSettingsControl2::setViewfinderSettings(const QCameraViewfinderSettings &settings) - - Sets the camera viewfinder \a settings. -*/ - -QT_END_NAMESPACE - -#include "moc_qcameraviewfindersettingscontrol.cpp" diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.h b/src/multimedia/controls/qcameraviewfindersettingscontrol.h deleted file mode 100644 index 7877bd1db..000000000 --- a/src/multimedia/controls/qcameraviewfindersettingscontrol.h +++ /dev/null @@ -1,103 +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 QCAMERAVIEWFINDERSETTINGSCONTROL_H -#define QCAMERAVIEWFINDERSETTINGSCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qcamera.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraViewfinderSettingsControl : public QMediaControl -{ - Q_OBJECT -public: - enum ViewfinderParameter { - Resolution, - PixelAspectRatio, - MinimumFrameRate, - MaximumFrameRate, - PixelFormat, - UserParameter = 1000 - }; - - ~QCameraViewfinderSettingsControl(); - - virtual bool isViewfinderParameterSupported(ViewfinderParameter parameter) const = 0; - virtual QVariant viewfinderParameter(ViewfinderParameter parameter) const = 0; - virtual void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) = 0; - -protected: - explicit QCameraViewfinderSettingsControl(QObject *parent = nullptr); -}; - -#define QCameraViewfinderSettingsControl_iid "org.qt-project.qt.cameraviewfindersettingscontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QCameraViewfinderSettingsControl, QCameraViewfinderSettingsControl_iid) - - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraViewfinderSettingsControl2 : public QMediaControl -{ - Q_OBJECT -public: - virtual ~QCameraViewfinderSettingsControl2(); - - virtual QList<QCameraViewfinderSettings> supportedViewfinderSettings() const = 0; - - virtual QCameraViewfinderSettings viewfinderSettings() const = 0; - virtual void setViewfinderSettings(const QCameraViewfinderSettings &settings) = 0; - -protected: - explicit QCameraViewfinderSettingsControl2(QObject *parent = nullptr); -}; - -#define QCameraViewfinderSettingsControl2_iid "org.qt-project.qt.cameraviewfindersettingscontrol2/5.5" -Q_MEDIA_DECLARE_CONTROL(QCameraViewfinderSettingsControl2, QCameraViewfinderSettingsControl2_iid) - -QT_END_NAMESPACE - -#endif // QCAMERAVIEWFINDERSETTINGSCONTROL_H diff --git a/src/multimedia/controls/qcamerazoomcontrol.cpp b/src/multimedia/controls/qcamerazoomcontrol.cpp deleted file mode 100644 index 1f0835224..000000000 --- a/src/multimedia/controls/qcamerazoomcontrol.cpp +++ /dev/null @@ -1,188 +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 <qcamerazoomcontrol.h> -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QCameraZoomControl - \obsolete - - - \brief The QCameraZoomControl class supplies control for - optical and digital camera zoom. - - \inmodule QtMultimedia - - - \ingroup multimedia_control - - The interface name of QCameraZoomControl is \c org.qt-project.qt.camerazoomcontrol/5.0 as - defined in QCameraZoomControl_iid. - - - \sa QMediaService::requestControl(), QCamera -*/ - -/*! - \macro QCameraZoomControl_iid - - \c org.qt-project.qt.camerazoomcontrol/5.0 - - Defines the interface name of the QCameraZoomControl class. - - \relates QCameraZoomControl -*/ - -/*! - Constructs a camera zoom control object with \a parent. -*/ - -QCameraZoomControl::QCameraZoomControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destruct the camera zoom control object. -*/ - -QCameraZoomControl::~QCameraZoomControl() -{ -} - -/*! - \fn qreal QCameraZoomControl::maximumOpticalZoom() const - - Returns the maximum optical zoom value, or 1.0 if optical zoom is not supported. -*/ - - -/*! - \fn qreal QCameraZoomControl::maximumDigitalZoom() const - - Returns the maximum digital zoom value, or 1.0 if digital zoom is not supported. -*/ - - -/*! - \fn qreal QCameraZoomControl::requestedOpticalZoom() const - - Return the requested optical zoom value. -*/ - -/*! - \fn qreal QCameraZoomControl::requestedDigitalZoom() const - - Return the requested digital zoom value. -*/ - -/*! - \fn qreal QCameraZoomControl::currentOpticalZoom() const - - Return the current optical zoom value. -*/ - -/*! - \fn qreal QCameraZoomControl::currentDigitalZoom() const - - Return the current digital zoom value. -*/ - -/*! - \fn void QCameraZoomControl::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 QCameraZoomControl::currentOpticalZoomChanged(qreal zoom) - - Signal emitted when the current optical \a zoom value changed. -*/ - -/*! - \fn void QCameraZoomControl::currentDigitalZoomChanged(qreal zoom) - - Signal emitted when the current digital \a zoom value changed. -*/ - -/*! - \fn void QCameraZoomControl::requestedOpticalZoomChanged(qreal zoom) - - Signal emitted when the requested optical \a zoom value changed. -*/ - -/*! - \fn void QCameraZoomControl::requestedDigitalZoomChanged(qreal zoom) - - Signal emitted when the requested digital \a zoom value changed. -*/ - - -/*! - \fn void QCameraZoomControl::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 QCameraZoomControl::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_qcamerazoomcontrol.cpp" diff --git a/src/multimedia/controls/qcamerazoomcontrol.h b/src/multimedia/controls/qcamerazoomcontrol.h deleted file mode 100644 index feca6a362..000000000 --- a/src/multimedia/controls/qcamerazoomcontrol.h +++ /dev/null @@ -1,86 +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 QCAMERAZOOMCONTROL_H -#define QCAMERAZOOMCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaobject.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QCameraZoomControl : public QMediaControl -{ - Q_OBJECT - -public: - ~QCameraZoomControl(); - - virtual qreal maximumOpticalZoom() const = 0; - virtual qreal maximumDigitalZoom() const = 0; - - virtual qreal requestedOpticalZoom() const = 0; - virtual qreal requestedDigitalZoom() const = 0; - virtual qreal currentOpticalZoom() const = 0; - virtual qreal currentDigitalZoom() const = 0; - - virtual void zoomTo(qreal optical, qreal digital) = 0; - -Q_SIGNALS: - void maximumOpticalZoomChanged(qreal); - void maximumDigitalZoomChanged(qreal); - - void requestedOpticalZoomChanged(qreal opticalZoom); - void requestedDigitalZoomChanged(qreal digitalZoom); - void currentOpticalZoomChanged(qreal opticalZoom); - void currentDigitalZoomChanged(qreal digitalZoom); - -protected: - explicit QCameraZoomControl(QObject *parent = nullptr); -}; - -#define QCameraZoomControl_iid "org.qt-project.qt.camerazoomcontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QCameraZoomControl, QCameraZoomControl_iid) - -QT_END_NAMESPACE - -#endif // QCAMERAZOOMCONTROL_H diff --git a/src/multimedia/controls/qcustomaudiorolecontrol.cpp b/src/multimedia/controls/qcustomaudiorolecontrol.cpp deleted file mode 100644 index f1b89eda5..000000000 --- a/src/multimedia/controls/qcustomaudiorolecontrol.cpp +++ /dev/null @@ -1,119 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 QNX Software Systems. All rights reserved. -** 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 "qmediacontrol_p.h" -#include "qcustomaudiorolecontrol.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QCustomAudioRoleControl - \obsolete - \inmodule QtMultimedia - \ingroup multimedia_control - \since 5.11 - - \brief The QCustomAudioRoleControl class provides control over the audio role of a media object. - - If a QMediaService supports audio roles it may implement QCustomAudioRoleControl in order to - provide access to roles unknown to Qt. - - The functionality provided by this control is exposed to application code through the - QMediaPlayer class. - - The interface name of QCustomAudioRoleControl is \c org.qt-project.qt.customaudiorolecontrol/5.11 as - defined in QCustomAudioRoleControl_iid. - - \sa QMediaService::requestControl(), QMediaPlayer -*/ - -/*! - \macro QCustomAudioRoleControl_iid - - \c org.qt-project.qt.customaudiorolecontrol/5.11 - - Defines the interface name of the QCustomAudioRoleControl class. - - \relates QCustomAudioRoleControl -*/ - -/*! - Construct a QCustomAudioRoleControl with the given \a parent. -*/ -QCustomAudioRoleControl::QCustomAudioRoleControl(QObject *parent) - : QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destroys the audio role control. -*/ -QCustomAudioRoleControl::~QCustomAudioRoleControl() -{ -} - -/*! - \fn QAudio::Role QCustomAudioRoleControl::customAudioRole() const - - Returns the audio role of the media played by the media service. -*/ - -/*! - \fn void QCustomAudioRoleControl::setCustomAudioRole(const QString &role) - - Sets the audio \a role of the media played by the media service. -*/ - -/*! - \fn QStringList QCustomAudioRoleControl::supportedCustomAudioRoles() const - - Returns a list of custom audio roles that the media service supports. An - empty list may indicate that the supported custom audio roles aren't known. - The list may not be complete. -*/ - -/*! - \fn void QCustomAudioRoleControl::customAudioRoleChanged(const QString &role) - - Signal emitted when the audio \a role has changed. - */ - -QT_END_NAMESPACE - -#include "moc_qcustomaudiorolecontrol.cpp" diff --git a/src/multimedia/controls/qcustomaudiorolecontrol.h b/src/multimedia/controls/qcustomaudiorolecontrol.h deleted file mode 100644 index 5a587c034..000000000 --- a/src/multimedia/controls/qcustomaudiorolecontrol.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 QNX Software Systems. All rights reserved. -** 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 QCUSTOMAUDIOROLECONTROL_H -#define QCUSTOMAUDIOROLECONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qaudio.h> - -QT_BEGIN_NAMESPACE - -// Class forward declaration required for QDoc bug -class QString; - -class Q_MULTIMEDIA_EXPORT QCustomAudioRoleControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QCustomAudioRoleControl(); - - virtual QString customAudioRole() const = 0; - virtual void setCustomAudioRole(const QString &role) = 0; - - virtual QStringList supportedCustomAudioRoles() const = 0; - -Q_SIGNALS: - void customAudioRoleChanged(const QString &role); - -protected: - explicit QCustomAudioRoleControl(QObject *parent = nullptr); -}; - -#define QCustomAudioRoleControl_iid "org.qt-project.qt.customaudiorolecontrol/5.11" -Q_MEDIA_DECLARE_CONTROL(QCustomAudioRoleControl, QCustomAudioRoleControl_iid) - -QT_END_NAMESPACE - -#endif // QCUSTOMAUDIOROLECONTROL_H diff --git a/src/multimedia/controls/qimageencodercontrol.cpp b/src/multimedia/controls/qimageencodercontrol.cpp deleted file mode 100644 index 6223c33c7..000000000 --- a/src/multimedia/controls/qimageencodercontrol.cpp +++ /dev/null @@ -1,137 +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 "qimageencodercontrol.h" -#include <QtCore/qstringlist.h> - -QT_BEGIN_NAMESPACE - -/*! - \class QImageEncoderControl - \obsolete - - \inmodule QtMultimedia - - - \ingroup multimedia_control - - \brief The QImageEncoderControl class provides access to the settings of a media service that - performs image encoding. - - If a QMediaService supports encoding image data it will implement QImageEncoderControl. - This control allows to \l {setImageSettings()}{set image encoding settings} and - provides functions for quering supported image \l {supportedImageCodecs()}{codecs} and - \l {supportedResolutions()}{resolutions}. - - The interface name of QImageEncoderControl is \c org.qt-project.qt.imageencodercontrol/5.0 as - defined in QImageEncoderControl_iid. - - \sa QImageEncoderSettings, QMediaService::requestControl() -*/ - -/*! - \macro QImageEncoderControl_iid - - \c org.qt-project.qt.imageencodercontrol/5.0 - - Defines the interface name of the QImageEncoderControl class. - - \relates QImageEncoderControl -*/ - -/*! - Constructs a new image encoder control object with the given \a parent -*/ -QImageEncoderControl::QImageEncoderControl(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys the image encoder control. -*/ -QImageEncoderControl::~QImageEncoderControl() -{ -} - -/*! - \fn QImageEncoderControl::supportedResolutions(const QImageEncoderSettings &settings = QImageEncoderSettings(), - bool *continuous = 0) const - - Returns a list of supported resolutions. - - If non null image \a settings parameter is passed, - the returned list is reduced to resolutions supported with partial settings applied. - It can be used to query the list of resolutions, supported by specific image codec. - - If the encoder supports arbitrary resolutions within the supported resolutions range, - *\a continuous is set to true, otherwise *\a continuous is set to false. -*/ - -/*! - \fn QImageEncoderControl::supportedImageCodecs() const - - Returns a list of supported image codecs. -*/ - -/*! - \fn QImageEncoderControl::imageCodecDescription(const QString &codec) const - - Returns a description of an image \a codec. -*/ - -/*! - \fn QImageEncoderControl::imageSettings() const - - Returns the currently used image encoder settings. - - The returned value may be different tha passed to QImageEncoderControl::setImageSettings() - if the settings contains the default or undefined parameters. - In this case if the undefined parameters are already resolved, they should be returned. -*/ - -/*! - \fn QImageEncoderControl::setImageSettings(const QImageEncoderSettings &settings) - - Sets the selected image encoder \a settings. -*/ - -QT_END_NAMESPACE - -#include "moc_qimageencodercontrol.cpp" diff --git a/src/multimedia/controls/qimageencodercontrol.h b/src/multimedia/controls/qimageencodercontrol.h deleted file mode 100644 index c33266d9a..000000000 --- a/src/multimedia/controls/qimageencodercontrol.h +++ /dev/null @@ -1,82 +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 QIMAGEENCODERCONTROL_H -#define QIMAGEENCODERCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediarecorder.h> -#include <QtMultimedia/qmediaencodersettings.h> - -#include <QtCore/qsize.h> - -QT_BEGIN_NAMESPACE - -class QByteArray; -QT_END_NAMESPACE - -QT_BEGIN_NAMESPACE - -class Q_MULTIMEDIA_EXPORT QImageEncoderControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QImageEncoderControl(); - - virtual QStringList supportedImageCodecs() const = 0; - virtual QString imageCodecDescription(const QString &codec) const = 0; - - virtual QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, - bool *continuous = nullptr) const = 0; - - virtual QImageEncoderSettings imageSettings() const = 0; - virtual void setImageSettings(const QImageEncoderSettings &settings) = 0; - -protected: - explicit QImageEncoderControl(QObject *parent = nullptr); -}; - -#define QImageEncoderControl_iid "org.qt-project.qt.imageencodercontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QImageEncoderControl, QImageEncoderControl_iid) - -QT_END_NAMESPACE - - -#endif diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.cpp b/src/multimedia/controls/qmediaaudioprobecontrol.cpp deleted file mode 100644 index e22135903..000000000 --- a/src/multimedia/controls/qmediaaudioprobecontrol.cpp +++ /dev/null @@ -1,103 +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 "qmediaaudioprobecontrol.h" -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QMediaAudioProbeControl - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - \brief The QMediaAudioProbeControl class allows control over probing audio data in media objects. - - \l QAudioProbe is the client facing class for probing audio - this class is implemented by - media backends to provide this functionality. - - The interface name of QMediaAudioProbeControl is \c org.qt-project.qt.mediaaudioprobecontrol/5.0 as - defined in QMediaAudioProbeControl_iid. - - \sa QAudioProbe, QMediaService::requestControl(), QMediaPlayer, QCamera -*/ - -/*! - \macro QMediaAudioProbeControl_iid - - \c org.qt-project.qt.mediaaudioprobecontrol/5.0 - - Defines the interface name of the QMediaAudioProbeControl class. - - \relates QMediaAudioProbeControl -*/ - -/*! - Create a new media audio probe control object with the given \a parent. -*/ -QMediaAudioProbeControl::QMediaAudioProbeControl(QObject *parent) - : QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! Destroys this audio probe control */ -QMediaAudioProbeControl::~QMediaAudioProbeControl() -{ -} - -/*! - \fn QMediaAudioProbeControl::audioBufferProbed(const QAudioBuffer &buffer) - - This signal should be emitted when an audio \a buffer is processed in the - media service. -*/ - - -/*! - \fn QMediaAudioProbeControl::flush() - - This signal should be emitted when it is required to release all frames. -*/ - -QT_END_NAMESPACE - -#include "moc_qmediaaudioprobecontrol.cpp" diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.h b/src/multimedia/controls/qmediaaudioprobecontrol.h deleted file mode 100644 index 74cb1bc5a..000000000 --- a/src/multimedia/controls/qmediaaudioprobecontrol.h +++ /dev/null @@ -1,68 +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 QMEDIAAUDIOPROBECONTROL_H -#define QMEDIAAUDIOPROBECONTROL_H - -#include <QtMultimedia/qmediacontrol.h> - -QT_BEGIN_NAMESPACE - -class QAudioBuffer; -class Q_MULTIMEDIA_EXPORT QMediaAudioProbeControl : public QMediaControl -{ - Q_OBJECT -public: - virtual ~QMediaAudioProbeControl(); - -Q_SIGNALS: - void audioBufferProbed(const QAudioBuffer &buffer); - void flush(); - -protected: - explicit QMediaAudioProbeControl(QObject *parent = nullptr); -}; - -#define QMediaAudioProbeControl_iid "org.qt-project.qt.mediaaudioprobecontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMediaAudioProbeControl, QMediaAudioProbeControl_iid) - -QT_END_NAMESPACE - - -#endif // QMEDIAAUDIOPROBECONTROL_H diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.cpp b/src/multimedia/controls/qmediaavailabilitycontrol.cpp deleted file mode 100644 index 68b404369..000000000 --- a/src/multimedia/controls/qmediaavailabilitycontrol.cpp +++ /dev/null @@ -1,109 +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 "qmediaavailabilitycontrol.h" -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QMediaAvailabilityControl - \obsolete - - \brief The QMediaAvailabilityControl class supplies a control for reporting availability of a service. - - \inmodule QtMultimedia - - - \ingroup multimedia_control - - An instance of QMediaObject (or its derived classes) can report any changes - in availability via this control. - - The interface name of QMediaAvailabilityControl is \c org.qt-project.qt.mediaavailabilitycontrol/5.0 as - defined in QMediaAvailabilityControl_iid. - - \sa QMediaService::requestControl(), QMediaObject -*/ - -/*! - \macro QMediaAvailabilityControl_iid - - \c org.qt-project.qt.mediaavailabilitycontrol/5.0 - - Defines the interface name of the QMediaAvailabilityControl class. - - \relates QMediaAvailabilityControl -*/ - -/*! - Constructs an availability control object with \a parent. -*/ -QMediaAvailabilityControl::QMediaAvailabilityControl(QObject *parent) - : QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destruct the availability control object. -*/ -QMediaAvailabilityControl::~QMediaAvailabilityControl() -{ -} - - -/*! - \fn QMultimedia::AvailabilityStatus QMediaAvailabilityControl::availability() const - - Returns the current availability of this instance of the media service. - If the availability changes at run time (for example, some other media - client takes all media resources) the availabilityChanges() signal - should be emitted. -*/ - - -/*! - \fn void QMediaAvailabilityControl::availabilityChanged(QMultimedia::AvailabilityStatus availability) - - Signal emitted when the current \a availability value changed. -*/ - -QT_END_NAMESPACE - -#include "moc_qmediaavailabilitycontrol.cpp" diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h deleted file mode 100644 index a61617b1f..000000000 --- a/src/multimedia/controls/qmediaavailabilitycontrol.h +++ /dev/null @@ -1,73 +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 QMEDIAAVAILABILITYCONTROL_H -#define QMEDIAAVAILABILITYCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaobject.h> -#include <QtMultimedia/qmultimedia.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QMediaAvailabilityControl : public QMediaControl -{ - Q_OBJECT - -public: - ~QMediaAvailabilityControl(); - - virtual QMultimedia::AvailabilityStatus availability() const = 0; - -Q_SIGNALS: - void availabilityChanged(QMultimedia::AvailabilityStatus availability); - -protected: - explicit QMediaAvailabilityControl(QObject *parent = nullptr); -}; - -#define QMediaAvailabilityControl_iid "org.qt-project.qt.mediaavailabilitycontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMediaAvailabilityControl, QMediaAvailabilityControl_iid) - -QT_END_NAMESPACE - -#endif // QMEDIAAVAILABILITYCONTROL_H diff --git a/src/multimedia/controls/qmediacontainercontrol.cpp b/src/multimedia/controls/qmediacontainercontrol.cpp deleted file mode 100644 index 2b2c8b78b..000000000 --- a/src/multimedia/controls/qmediacontainercontrol.cpp +++ /dev/null @@ -1,122 +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 "qmediacontainercontrol.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QMediaContainerControl - \obsolete - - \brief The QMediaContainerControl class provides access to the output container format of a QMediaService. - - \inmodule QtMultimedia - - - \ingroup multimedia_control - - If a QMediaService supports writing encoded data it will implement - QMediaContainerControl. This control provides information about the output - containers supported by a media service and allows one to be selected as - the current output containers. - - The functionality provided by this control is exposed to application code - through the QMediaRecorder class. - - The interface name of QMediaContainerControl is \c org.qt-project.qt.mediacontainercontrol/5.0 as - defined in QMediaContainerControl_iid. - - \sa QMediaService::requestControl(), QMediaRecorder -*/ - -/*! - \macro QMediaContainerControl_iid - - \c org.qt-project.qt.mediacontainercontrol/5.0 - - Defines the interface name of the QMediaContainerControl class. - - \relates QMediaContainerControl -*/ - -/*! - Constructs a new media container control with the given \a parent. -*/ -QMediaContainerControl::QMediaContainerControl(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys a media container control. -*/ -QMediaContainerControl::~QMediaContainerControl() -{ -} - - -/*! - \fn QMediaContainerControl::supportedContainers() const - - Returns a list of MIME types of supported container formats. -*/ - -/*! - \fn QMediaContainerControl::containerFormat() const - - Returns the selected container format. -*/ - -/*! - \fn QMediaContainerControl::setContainerFormat(const QString &format) - - Sets the current container \a format. -*/ - -/*! - \fn QMediaContainerControl::containerDescription(const QString &formatMimeType) const - - Returns a description of the container \a formatMimeType. -*/ - -QT_END_NAMESPACE - -#include "moc_qmediacontainercontrol.cpp" diff --git a/src/multimedia/controls/qmediacontainercontrol.h b/src/multimedia/controls/qmediacontainercontrol.h deleted file mode 100644 index 23c2918b9..000000000 --- a/src/multimedia/controls/qmediacontainercontrol.h +++ /dev/null @@ -1,74 +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 QMEDIACONTAINERCONTROL_H -#define QMEDIACONTAINERCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QMediaContainerControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QMediaContainerControl(); - - virtual QStringList supportedContainers() const = 0; - virtual QString containerFormat() const = 0; - virtual void setContainerFormat(const QString &format) = 0; - - virtual QString containerDescription(const QString &formatMimeType) const = 0; - -protected: - explicit QMediaContainerControl(QObject *parent = nullptr); -}; - -#define QMediaContainerControl_iid "org.qt-project.qt.mediacontainercontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMediaContainerControl, QMediaContainerControl_iid) - -QT_END_NAMESPACE - - -#endif // QMEDIACONTAINERCONTROL_H diff --git a/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp b/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp deleted file mode 100644 index c9f531454..000000000 --- a/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp +++ /dev/null @@ -1,157 +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 "qmediagaplessplaybackcontrol.h" -#include "qmediacontrol_p.h" - -/*! - \class QMediaGaplessPlaybackControl - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - \brief The QMediaGaplessPlaybackControl class provides access to the gapless playback - related control of a QMediaService. - - If a QMediaService supports gapless playback it will implement QMediaGaplessPlaybackControl. - This control provides a means to set the \l {setNextMedia()}{next media} or - \l {setCrossfadeTime()}{crossfade time} for smooth transitions between tracks. - - The functionality provided by this control is exposed to application - code through the QMediaPlayer class. - - The interface name of QMediaGaplessPlaybackControl is - \c org.qt-project.qt.mediagaplessplaybackcontrol/5.0 as defined in QMediaGaplessPlaybackControl_iid. - - \sa QMediaService::requestControl(), QMediaPlayer -*/ - -/*! - \macro QMediaGaplessPlaybackControl_iid - - \c org.qt-project.qt.mediagaplessplaybackcontrol/5.0 - - Defines the interface name of the QMediaGaplessPlaybackControl class. - - \relates QMediaGaplessPlaybackControl -*/ - -/*! - Destroys a gapless playback control. -*/ -QMediaGaplessPlaybackControl::~QMediaGaplessPlaybackControl() -{ -} - -/*! - Constructs a new gapless playback control with the given \a parent. -*/ -QMediaGaplessPlaybackControl::QMediaGaplessPlaybackControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - \fn QMediaGaplessPlaybackControl::nextMedia() const - - Returns the content of the next media -*/ - -/*! - \fn QMediaGaplessPlaybackControl::setNextMedia(const QMediaContent& media) - - Sets the next \a media for smooth transition. -*/ - -/*! - \fn QMediaGaplessPlaybackControl::nextMediaChanged(const QMediaContent& media) - - Signals that the next \a media has changed (either explicitly via \l setNextMedia() or when the - player clears the next media while advancing to it). - - \sa nextMedia() -*/ - -/*! - \fn QMediaGaplessPlaybackControl::advancedToNextMedia() - - Signals when the player advances to the next media (the content of next media will be cleared). - - \sa nextMedia() -*/ - -/*! - \fn QMediaGaplessPlaybackControl::isCrossfadeSupported() const - - Indicates whether crossfading is supported or not. - If crossfading is not supported, \l setCrossfadeTime() will be ignored and \l crossfadeTime() will - always return 0. - -*/ - -/*! - \fn QMediaGaplessPlaybackControl::setCrossfadeTime(qreal crossfadeTime) - - Sets the \a crossfadeTime in seconds for smooth transition. - - Positive value means how much time it will take for the next media to transit from silent to - full volume and vice versa for current one. So both current and the next one will be playing - during this period of time. - - A crossfade time of zero or negative will result in gapless playback (suitable for some - continuous media). - -*/ - -/*! - \fn QMediaGaplessPlaybackControl::crossfadeTime() const - - Returns current crossfade time in seconds. -*/ - -/*! - \fn QMediaGaplessPlaybackControl::crossfadeTimeChanged(qreal crossfadeTime) - - Signals that the \a crossfadeTime has changed. - - \sa crossfadeTime() -*/ - diff --git a/src/multimedia/controls/qmediagaplessplaybackcontrol.h b/src/multimedia/controls/qmediagaplessplaybackcontrol.h deleted file mode 100644 index 23e2b4fc2..000000000 --- a/src/multimedia/controls/qmediagaplessplaybackcontrol.h +++ /dev/null @@ -1,77 +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 QMEDIAGAPLESSPLAYBACKCONTROL_H -#define QMEDIAGAPLESSPLAYBACKCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediacontent.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QMediaGaplessPlaybackControl : public QMediaControl -{ - Q_OBJECT -public: - virtual ~QMediaGaplessPlaybackControl(); - - virtual QMediaContent nextMedia() const = 0; - virtual void setNextMedia(const QMediaContent &media) = 0; - - virtual bool isCrossfadeSupported() const = 0; - virtual qreal crossfadeTime() const = 0; - virtual void setCrossfadeTime(qreal crossfadeTime) = 0; - -Q_SIGNALS: - void crossfadeTimeChanged(qreal crossfadeTime); - void nextMediaChanged(const QMediaContent& media); - void advancedToNextMedia(); - -protected: - explicit QMediaGaplessPlaybackControl(QObject *parent = nullptr); -}; - -#define QMediaGaplessPlaybackControl_iid "org.qt-project.qt.mediagaplessplaybackcontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMediaGaplessPlaybackControl, QMediaGaplessPlaybackControl_iid) - -QT_END_NAMESPACE - -#endif // QMEDIAGAPLESSPLAYBACKCONTROL_H diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp deleted file mode 100644 index a180413b9..000000000 --- a/src/multimedia/controls/qmediaplayercontrol.cpp +++ /dev/null @@ -1,386 +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 "qmediaplayercontrol.h" -#include "qmediacontrol_p.h" -#include "qmediaplayer.h" - -QT_BEGIN_NAMESPACE - - -/*! - \class QMediaPlayerControl - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - - \brief The QMediaPlayerControl class provides access to the media playing - functionality of a QMediaService. - - If a QMediaService can play media is will implement QMediaPlayerControl. - This control provides a means to set the \l {setMedia()}{media} to play, - \l {play()}{start}, \l {pause()} {pause} and \l {stop()}{stop} playback, - \l {setPosition()}{seek}, and control the \l {setVolume()}{volume}. - It also provides feedback on the \l {duration()}{duration} of the media, - the current \l {position()}{position}, and \l {bufferStatus()}{buffering} - progress. - - The functionality provided by this control is exposed to application - code through the QMediaPlayer class. - - The interface name of QMediaPlayerControl is \c org.qt-project.qt.mediaplayercontrol/5.0 as - defined in QMediaPlayerControl_iid. - - \sa QMediaService::requestControl(), QMediaPlayer -*/ - -/*! - \macro QMediaPlayerControl_iid - - \c org.qt-project.qt.mediaplayercontrol/5.0 - - Defines the interface name of the QMediaPlayerControl class. - - \relates QMediaPlayerControl -*/ - -/*! - Destroys a media player control. -*/ -QMediaPlayerControl::~QMediaPlayerControl() -{ -} - -/*! - Constructs a new media player control with the given \a parent. -*/ -QMediaPlayerControl::QMediaPlayerControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - \fn QMediaPlayerControl::state() const - - Returns the state of a player control. -*/ - -/*! - \fn QMediaPlayerControl::stateChanged(QMediaPlayer::State newState) - - Signals that the state of a player control has changed to \a newState. - - \sa state() -*/ - -/*! - \fn QMediaPlayerControl::mediaStatus() const - - Returns the status of the current media. -*/ - - -/*! - \fn QMediaPlayerControl::mediaStatusChanged(QMediaPlayer::MediaStatus status) - - Signals that the \a status of the current media has changed. - - \sa mediaStatus() -*/ - - -/*! - \fn QMediaPlayerControl::duration() const - - Returns the duration of the current media in milliseconds. -*/ - -/*! - \fn QMediaPlayerControl::durationChanged(qint64 duration) - - Signals that the \a duration of the current media has changed. - - \sa duration() -*/ - -/*! - \fn QMediaPlayerControl::position() const - - Returns the current playback position in milliseconds. -*/ - -/*! - \fn QMediaPlayerControl::setPosition(qint64 position) - - Sets the playback \a position of the current media. This will initiate a seek and it may take - some time for playback to reach the position set. -*/ - -/*! - \fn QMediaPlayerControl::positionChanged(qint64 position) - - Signals the playback \a position has changed. - - This is only emitted in when there has been a discontinous change in the playback postion, such - as a seek or the position being reset. - - \sa position() -*/ - -/*! - \fn QMediaPlayerControl::volume() const - - Returns the audio volume of a player control. -*/ - -/*! - \fn QMediaPlayerControl::setVolume(int volume) - - Sets the audio \a volume of a player control. - - The volume is scaled linearly, ranging from \c 0 (silence) to \c 100 (full volume). -*/ - -/*! - \fn QMediaPlayerControl::volumeChanged(int volume) - - Signals the audio \a volume of a player control has changed. - - \sa volume() -*/ - -/*! - \fn QMediaPlayerControl::isMuted() const - - Returns the mute state of a player control. -*/ - -/*! - \fn QMediaPlayerControl::setMuted(bool mute) - - Sets the \a mute state of a player control. -*/ - -/*! - \fn QMediaPlayerControl::mutedChanged(bool mute) - - Signals a change in the \a mute status of a player control. - - \sa isMuted() -*/ - -/*! - \fn QMediaPlayerControl::bufferStatus() const - - Returns the buffering progress of the current media. Progress is measured in the percentage - of the buffer filled. -*/ - -/*! - \fn QMediaPlayerControl::bufferStatusChanged(int percentFilled) - - Signal the amount of the local buffer filled as a percentage by \a percentFilled. - - \sa bufferStatus() -*/ - -/*! - \fn QMediaPlayerControl::isAudioAvailable() const - - Identifies if there is audio output available for the current media. - - Returns true if audio output is available and false otherwise. -*/ - -/*! - \fn QMediaPlayerControl::audioAvailableChanged(bool audioAvailable) - - Signals that there has been a change in the availability of audio output \a audioAvailable. - - \sa isAudioAvailable() -*/ - -/*! - \fn QMediaPlayerControl::isVideoAvailable() const - - Identifies if there is video output available for the current media. - - Returns true if video output is available and false otherwise. -*/ - -/*! - \fn QMediaPlayerControl::videoAvailableChanged(bool videoAvailable) - - Signal that the availability of visual content has changed to \a videoAvailable. - - \sa isVideoAvailable() -*/ - -/*! - \fn QMediaPlayerControl::isSeekable() const - - Identifies if the current media is seekable. - - Returns true if it possible to seek within the current media, and false otherwise. -*/ - -/*! - \fn QMediaPlayerControl::seekableChanged(bool seekable) - - Signals that the \a seekable state of a player control has changed. - - \sa isSeekable() -*/ - -/*! - \fn QMediaPlayerControl::availablePlaybackRanges() const - - Returns a range of times in milliseconds that can be played back. - - Usually for local files this is a continuous interval equal to [0..duration()] - or an empty time range if seeking is not supported, but for network sources - it refers to the buffered parts of the media. -*/ - -/*! - \fn QMediaPlayerControl::availablePlaybackRangesChanged(const QMediaTimeRange &ranges) - - Signals that the available media playback \a ranges have changed. - - \sa QMediaPlayerControl::availablePlaybackRanges() -*/ - -/*! - \fn qreal QMediaPlayerControl::playbackRate() const - - Returns the rate of playback. -*/ - -/*! - \fn QMediaPlayerControl::setPlaybackRate(qreal rate) - - Sets the \a rate of playback. -*/ - -/*! - \fn QMediaPlayerControl::media() const - - Returns the current media source. -*/ - -/*! - \fn QMediaPlayerControl::mediaStream() const - - Returns the current media stream. This is only a valid if a stream was passed to setMedia(). - - \sa setMedia() -*/ - -/*! - \fn QMediaPlayerControl::setMedia(const QMediaContent &media, QIODevice *stream) - - Sets the current \a media source. If a \a stream is supplied; data will be read from that - instead of attempting to resolve the media source. The media source may still be used to - supply media information such as mime type. - - Setting the media to a null QMediaContent will cause the control to discard all - information relating to the current media source and to cease all I/O operations related - to that media. - - Qt resource files are never passed as is. If the service supports - QMediaServiceProviderHint::StreamPlayback, a \a stream is supplied, pointing to an opened - QFile. Otherwise, the resource is copied into a temporary file and \a media contains the - url to that file. -*/ - -/*! - \fn QMediaPlayerControl::mediaChanged(const QMediaContent& content) - - Signals that the current media \a content has changed. -*/ - -/*! - \fn QMediaPlayerControl::play() - - Starts playback of the current media. - - If successful the player control will immediately enter the \l {QMediaPlayer::PlayingState} - {playing} state. - - \sa state() -*/ - -/*! - \fn QMediaPlayerControl::pause() - - Pauses playback of the current media. - - If successful the player control will immediately enter the \l {QMediaPlayer::PausedState} - {paused} state. - - \sa state(), play(), stop() -*/ - -/*! - \fn QMediaPlayerControl::stop() - - Stops playback of the current media. - - If successful the player control will immediately enter the \l {QMediaPlayer::StoppedState} - {stopped} state. -*/ - -/*! - \fn QMediaPlayerControl::error(int error, const QString &errorString) - - Signals that an \a error has occurred. The \a errorString provides a more detailed explanation. -*/ - -/*! - \fn QMediaPlayerControl::playbackRateChanged(qreal rate) - - Signal emitted when playback rate changes to \a rate. -*/ - -QT_END_NAMESPACE - -#include "moc_qmediaplayercontrol.cpp" diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h deleted file mode 100644 index 8b5072572..000000000 --- a/src/multimedia/controls/qmediaplayercontrol.h +++ /dev/null @@ -1,123 +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 QMEDIAPLAYERCONTROL_H -#define QMEDIAPLAYERCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaplayer.h> -#include <QtMultimedia/qmediatimerange.h> - -#include <QtCore/qpair.h> - -QT_BEGIN_NAMESPACE - - -class QMediaPlaylist; - -class Q_MULTIMEDIA_EXPORT QMediaPlayerControl : public QMediaControl -{ - Q_OBJECT - -public: - ~QMediaPlayerControl(); - - virtual QMediaPlayer::State state() const = 0; - - virtual QMediaPlayer::MediaStatus mediaStatus() const = 0; - - virtual qint64 duration() const = 0; - - virtual qint64 position() const = 0; - virtual void setPosition(qint64 position) = 0; - - virtual int volume() const = 0; - virtual void setVolume(int volume) = 0; - - virtual bool isMuted() const = 0; - virtual void setMuted(bool mute) = 0; - - virtual int bufferStatus() const = 0; - - virtual bool isAudioAvailable() const = 0; - virtual bool isVideoAvailable() const = 0; - - virtual bool isSeekable() const = 0; - - virtual QMediaTimeRange availablePlaybackRanges() const = 0; - - virtual qreal playbackRate() const = 0; - virtual void setPlaybackRate(qreal rate) = 0; - - virtual QMediaContent media() const = 0; - virtual const QIODevice *mediaStream() const = 0; - virtual void setMedia(const QMediaContent &media, QIODevice *stream) = 0; - - virtual void play() = 0; - virtual void pause() = 0; - virtual void stop() = 0; - -Q_SIGNALS: - void mediaChanged(const QMediaContent& content); - void durationChanged(qint64 duration); - void positionChanged(qint64 position); - void stateChanged(QMediaPlayer::State newState); - void mediaStatusChanged(QMediaPlayer::MediaStatus status); - void volumeChanged(int volume); - void mutedChanged(bool mute); - void audioAvailableChanged(bool audioAvailable); - void videoAvailableChanged(bool videoAvailable); - void bufferStatusChanged(int percentFilled); - void seekableChanged(bool seekable); - void availablePlaybackRangesChanged(const QMediaTimeRange &ranges); - void playbackRateChanged(qreal rate); - void error(int error, const QString &errorString); - -protected: - explicit QMediaPlayerControl(QObject *parent = nullptr); -}; - -#define QMediaPlayerControl_iid "org.qt-project.qt.mediaplayercontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMediaPlayerControl, QMediaPlayerControl_iid) - -QT_END_NAMESPACE - - -#endif // QMEDIAPLAYERCONTROL_H - diff --git a/src/multimedia/controls/qmediaplaylistcontrol.cpp b/src/multimedia/controls/qmediaplaylistcontrol.cpp deleted file mode 100644 index 61e20e170..000000000 --- a/src/multimedia/controls/qmediaplaylistcontrol.cpp +++ /dev/null @@ -1,206 +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 "qmediaplaylistcontrol_p.h" -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QMediaPlaylistControl - \internal - - \inmodule QtMultimedia - - - \ingroup multimedia_control - - - \brief The QMediaPlaylistControl class provides access to the playlist - functionality of a QMediaService. - - If a QMediaService contains an internal playlist it will implement - QMediaPlaylistControl. This control provides access to the contents of the - \l {playlistProvider()}{playlist}, as well as the \l - {currentIndex()}{position} of the current media, and a means of navigating - to the \l {next()}{next} and \l {previous()}{previous} media. - - The functionality provided by the control is exposed to application code - through the QMediaPlaylist class. - - The interface name of QMediaPlaylistControl is \c org.qt-project.qt.mediaplaylistcontrol/5.0 as - defined in QMediaPlaylistControl_iid. - - \sa QMediaService::requestControl(), QMediaPlayer -*/ - -/*! - \macro QMediaPlaylistControl_iid - - \c org.qt-project.qt.mediaplaylistcontrol/5.0 - - Defines the interface name of the QMediaPlaylistControl class. - - \relates QMediaPlaylistControl -*/ - -/*! - Create a new playlist control object with the given \a parent. -*/ -QMediaPlaylistControl::QMediaPlaylistControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destroys the playlist control. -*/ -QMediaPlaylistControl::~QMediaPlaylistControl() -{ -} - - -/*! - \fn QMediaPlaylistControl::playlistProvider() const - - Returns the playlist used by this media player. -*/ - -/*! - \fn QMediaPlaylistControl::setPlaylistProvider(QMediaPlaylistProvider *playlist) - - Set the playlist of this media player to \a playlist. - - In many cases it is possible just to use the playlist - constructed by player, but sometimes replacing the whole - playlist allows to avoid copyting of all the items bettween playlists. - - Returns true if player can use this passed playlist; otherwise returns false. - -*/ - -/*! - \fn QMediaPlaylistControl::currentIndex() const - - Returns position of the current media source in the playlist. -*/ - -/*! - \fn QMediaPlaylistControl::setCurrentIndex(int position) - - Jump to the item at the given \a position. -*/ - -/*! - \fn QMediaPlaylistControl::nextIndex(int step) const - - Returns the index of item, which were current after calling next() - \a step times. - - Returned value depends on the size of playlist, current position - and playback mode. - - \sa QMediaPlaylist::playbackMode -*/ - -/*! - \fn QMediaPlaylistControl::previousIndex(int step) const - - Returns the index of item, which were current after calling previous() - \a step times. - - \sa QMediaPlaylist::playbackMode -*/ - -/*! - \fn QMediaPlaylistControl::next() - - Moves to the next item in playlist. -*/ - -/*! - \fn QMediaPlaylistControl::previous() - - Returns to the previous item in playlist. -*/ - -/*! - \fn QMediaPlaylistControl::playbackMode() const - - Returns the playlist navigation mode. - - \sa QMediaPlaylist::PlaybackMode -*/ - -/*! - \fn QMediaPlaylistControl::setPlaybackMode(QMediaPlaylist::PlaybackMode mode) - - Sets the playback \a mode. - - \sa QMediaPlaylist::PlaybackMode -*/ - -/*! - \fn QMediaPlaylistControl::playlistProviderChanged() - - Signal emitted when the playlist provider has changed. -*/ - -/*! - \fn QMediaPlaylistControl::currentIndexChanged(int position) - - Signal emitted when the playlist \a position is changed. -*/ - -/*! - \fn QMediaPlaylistControl::playbackModeChanged(QMediaPlaylist::PlaybackMode mode) - - Signal emitted when the playback \a mode is changed. -*/ - -/*! - \fn QMediaPlaylistControl::currentMediaChanged(const QMediaContent& content) - - Signal emitted when current media changes to \a content. -*/ - -QT_END_NAMESPACE - -#include "moc_qmediaplaylistcontrol_p.cpp" diff --git a/src/multimedia/controls/qmediaplaylistcontrol_p.h b/src/multimedia/controls/qmediaplaylistcontrol_p.h deleted file mode 100644 index 93c5a3e25..000000000 --- a/src/multimedia/controls/qmediaplaylistcontrol_p.h +++ /dev/null @@ -1,102 +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 QMEDIAPLAYLISTCONTROL_P_H -#define QMEDIAPLAYLISTCONTROL_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <QtCore/qobject.h> -#include "qmediacontrol.h" -#include <private/qmediaplaylistnavigator_p.h> - - -QT_BEGIN_NAMESPACE - - -class QMediaPlaylistProvider; - -class Q_MULTIMEDIA_EXPORT QMediaPlaylistControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QMediaPlaylistControl(); - - virtual QMediaPlaylistProvider* playlistProvider() const = 0; - virtual bool setPlaylistProvider(QMediaPlaylistProvider *playlist) = 0; - - virtual int currentIndex() const = 0; - virtual void setCurrentIndex(int position) = 0; - virtual int nextIndex(int steps) const = 0; - virtual int previousIndex(int steps) const = 0; - - virtual void next() = 0; - virtual void previous() = 0; - - virtual QMediaPlaylist::PlaybackMode playbackMode() const = 0; - virtual void setPlaybackMode(QMediaPlaylist::PlaybackMode mode) = 0; - -Q_SIGNALS: - void playlistProviderChanged(); - void currentIndexChanged(int position); - void currentMediaChanged(const QMediaContent&); - void playbackModeChanged(QMediaPlaylist::PlaybackMode mode); - -protected: - QMediaPlaylistControl(QObject *parent = nullptr); -}; - -#define QMediaPlaylistControl_iid "org.qt-project.qt.mediaplaylistcontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistControl, QMediaPlaylistControl_iid) - -QT_END_NAMESPACE - - -#endif // QMEDIAPLAYLISTCONTROL_P_H diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp deleted file mode 100644 index f95c4b508..000000000 --- a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp +++ /dev/null @@ -1,126 +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 "qmediaplaylistsourcecontrol_p.h" -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QMediaPlaylistSourceControl - \internal - - \inmodule QtMultimedia - - - \ingroup multimedia_control - - - \brief The QMediaPlaylistSourceControl class provides access to the playlist playback - functionality of a QMediaService. - - This control allows QMediaPlaylist to be passed directly to the service - instead of playing media sources one by one. This control should be - implemented if backend benefits from knowing the next media source to be - played, for example for preloading, cross fading or gap-less playback. - - If QMediaPlaylistSourceControl is provided, the backend must listen for - current playlist item changes to load corresponding media source and - advance the playlist with QMediaPlaylist::next() when playback of the - current media is finished. - - The interface name of QMediaPlaylistSourceControl is \c org.qt-project.qt.mediaplaylistsourcecontrol/5.0 as - defined in QMediaPlaylistSourceControl_iid. - - \sa QMediaService::requestControl(), QMediaPlayer -*/ - -/*! - \macro QMediaPlaylistSourceControl_iid - - \c org.qt-project.qt.mediaplaylistsourcecontrol/5.0 - - Defines the interface name of the QMediaPlaylistSourceControl class. - - \relates QMediaPlaylistSourceControl -*/ - -/*! - Create a new playlist source control object with the given \a parent. -*/ -QMediaPlaylistSourceControl::QMediaPlaylistSourceControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destroys the playlist control. -*/ -QMediaPlaylistSourceControl::~QMediaPlaylistSourceControl() -{ -} - - -/*! - \fn QMediaPlaylistSourceControl::playlist() const - - Returns the current playlist. - Should return a null pointer if no playlist is assigned. -*/ - -/*! - \fn QMediaPlaylistSourceControl::setPlaylist(QMediaPlaylist *playlist) - - Set the playlist of this media player to \a playlist. - If a null pointer is passed, the playlist source should be disabled. - - The current media should be replaced with the current item of the media playlist. -*/ - - -/*! - \fn QMediaPlaylistSourceControl::playlistChanged(QMediaPlaylist* playlist) - - Signal emitted when the playlist has changed to \a playlist. -*/ - -QT_END_NAMESPACE - -#include "moc_qmediaplaylistsourcecontrol_p.cpp" diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h b/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h deleted file mode 100644 index a98ee8738..000000000 --- a/src/multimedia/controls/qmediaplaylistsourcecontrol_p.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 QMEDIAPLAYLISTSOURCECONTROL_P_H -#define QMEDIAPLAYLISTSOURCECONTROL_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <qmediacontrol.h> - -QT_BEGIN_NAMESPACE - - -class QMediaPlaylist; - -class Q_MULTIMEDIA_EXPORT QMediaPlaylistSourceControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QMediaPlaylistSourceControl(); - - virtual QMediaPlaylist *playlist() const = 0; - virtual void setPlaylist(QMediaPlaylist *) = 0; - -Q_SIGNALS: - void playlistChanged(QMediaPlaylist* playlist); - -protected: - QMediaPlaylistSourceControl(QObject *parent = nullptr); -}; - -#define QMediaPlaylistSourceControl_iid "org.qt-project.qt.mediaplaylistsourcecontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistSourceControl, QMediaPlaylistSourceControl_iid) - -QT_END_NAMESPACE - - -#endif // QMEDIAPLAYLISTCONTROL_P_H diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp deleted file mode 100644 index 87ace7017..000000000 --- a/src/multimedia/controls/qmediarecordercontrol.cpp +++ /dev/null @@ -1,223 +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 of a QMediaService. - - Generally you will use the QMediaRecorder class in application code - this - class is mostly used when implementing a new QMediaService or if there is - access to specific low level functionality not otherwise present in QMediaRecorder. - - If a QMediaService can record media it will implement QMediaRecorderControl. - 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. - - The interface name of QMediaRecorderControl is \c org.qt-project.qt.mediarecordercontrol/5.0 as - defined in QMediaRecorderControl_iid. - - \sa QMediaService::requestControl(), QMediaRecorder - -*/ - -/*! - \macro QMediaRecorderControl_iid - - \c org.qt-project.qt.mediarecordercontrol/5.0 - - Defines the interface name of the QMediaRecorderControl class. - - \relates QMediaRecorderControl -*/ - -/*! - Constructs a media recorder control with the given \a parent. -*/ - -QMediaRecorderControl::QMediaRecorderControl(QObject* parent) - : QMediaControl(parent) -{ -} - -/*! - Destroys a media recorder control. -*/ - -QMediaRecorderControl::~QMediaRecorderControl() -{ -} - -/*! - \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 a0529ce59..000000000 --- a/src/multimedia/controls/qmediarecordercontrol.h +++ /dev/null @@ -1,100 +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/qmediacontrol.h> -#include <QtMultimedia/qmediarecorder.h> - -QT_BEGIN_NAMESPACE - -class QUrl; -QT_END_NAMESPACE - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QMediaRecorderControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QMediaRecorderControl(); - - 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; - -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); - -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); -}; - -#define QMediaRecorderControl_iid "org.qt-project.qt.mediarecordercontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMediaRecorderControl, QMediaRecorderControl_iid) - -QT_END_NAMESPACE - - -#endif diff --git a/src/multimedia/controls/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp deleted file mode 100644 index 2db9eb6fc..000000000 --- a/src/multimedia/controls/qmediastreamscontrol.cpp +++ /dev/null @@ -1,161 +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 "qmediastreamscontrol.h" -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -static void qRegisterMediaStreamControlMetaTypes() -{ - qRegisterMetaType<QMediaStreamsControl::StreamType>(); -} - -Q_CONSTRUCTOR_FUNCTION(qRegisterMediaStreamControlMetaTypes) - - -/*! - \class QMediaStreamsControl - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - \brief The QMediaStreamsControl class provides a media stream selection control. - - - The QMediaStreamsControl class provides descriptions of the available media streams - and allows individual streams to be activated and deactivated. - - The interface name of QMediaStreamsControl is \c org.qt-project.qt.mediastreamscontrol/5.0 as - defined in QMediaStreamsControl_iid. - - \sa QMediaService::requestControl() -*/ - -/*! - \macro QMediaStreamsControl_iid - - \c org.qt-project.qt.mediastreamscontrol/5.0 - - Defines the interface name of the QMediaStreamsControl class. - - \relates QMediaStreamsControl -*/ - -/*! - Constructs a new media streams control with the given \a parent. -*/ -QMediaStreamsControl::QMediaStreamsControl(QObject *parent) - :QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destroys a media streams control. -*/ -QMediaStreamsControl::~QMediaStreamsControl() -{ -} - -/*! - \enum QMediaStreamsControl::StreamType - - Media stream type. - - \value AudioStream Audio stream. - \value VideoStream Video stream. - \value SubPictureStream Subpicture or teletext stream. - \value UnknownStream The stream type is unknown. - \value DataStream -*/ - -/*! - \fn QMediaStreamsControl::streamCount() - - Returns the number of media streams. -*/ - -/*! - \fn QMediaStreamsControl::streamType(int streamNumber) - - Return the type of media stream \a streamNumber. -*/ - -/*! - \fn QMediaStreamsControl::metaData(int streamNumber, const QString &key) - - Returns the meta-data value of \a key for the given \a streamNumber. - - Useful metadata keys are QMediaMetaData::Title, - QMediaMetaData::Description and QMediaMetaData::Language. -*/ - -/*! - \fn QMediaStreamsControl::isActive(int streamNumber) - - Returns true if the media stream \a streamNumber is active. -*/ - -/*! - \fn QMediaStreamsControl::setActive(int streamNumber, bool state) - - Sets the active \a state of media stream \a streamNumber. - - Setting the active state of a media stream to true will activate it. If any other stream - of the same type was previously active it will be deactivated. Setting the active state fo a - media stream to false will deactivate it. -*/ - -/*! - \fn QMediaStreamsControl::streamsChanged() - - The signal is emitted when the available streams list is changed. -*/ - -/*! - \fn QMediaStreamsControl::activeStreamsChanged() - - The signal is emitted when the active streams list is changed. -*/ - -QT_END_NAMESPACE - -#include "moc_qmediastreamscontrol.cpp" diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h deleted file mode 100644 index e2506882d..000000000 --- a/src/multimedia/controls/qmediastreamscontrol.h +++ /dev/null @@ -1,89 +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 QMEDIASTREAMSCONTROL_H -#define QMEDIASTREAMSCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmultimedia.h> -#include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmediaenumdebug.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QMediaStreamsControl : public QMediaControl -{ - Q_OBJECT - Q_ENUMS(SteamType) -public: - enum StreamType { UnknownStream, VideoStream, AudioStream, SubPictureStream, DataStream }; - - virtual ~QMediaStreamsControl(); - - virtual int streamCount() = 0; - virtual StreamType streamType(int streamNumber) = 0; - - virtual QVariant metaData(int streamNumber, const QString &key) = 0; - - virtual bool isActive(int streamNumber) = 0; - virtual void setActive(int streamNumber, bool state) = 0; - -Q_SIGNALS: - void streamsChanged(); - void activeStreamsChanged(); - -protected: - explicit QMediaStreamsControl(QObject *parent = nullptr); -}; - -#define QMediaStreamsControl_iid "org.qt-project.qt.mediastreamscontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMediaStreamsControl, QMediaStreamsControl_iid) - -QT_END_NAMESPACE - -Q_DECLARE_METATYPE(QMediaStreamsControl::StreamType) - -Q_MEDIA_ENUM_DEBUG(QMediaStreamsControl, StreamType) - -#endif // QMEDIASTREAMSCONTROL_H - diff --git a/src/multimedia/controls/qmediavideoprobecontrol.cpp b/src/multimedia/controls/qmediavideoprobecontrol.cpp deleted file mode 100644 index 4a85d56d0..000000000 --- a/src/multimedia/controls/qmediavideoprobecontrol.cpp +++ /dev/null @@ -1,102 +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 "qmediavideoprobecontrol.h" -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QMediaVideoProbeControl - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - \brief The QMediaVideoProbeControl class allows control over probing video frames in media objects. - - \l QVideoProbe is the client facing class for probing video - this class is implemented by - media backends to provide this functionality. - - The interface name of QMediaVideoProbeControl is \c org.qt-project.qt.mediavideoprobecontrol/5.0 as - defined in QMediaVideoProbeControl_iid. - - \sa QVideoProbe, QMediaService::requestControl(), QMediaPlayer, QCamera -*/ - -/*! - \macro QMediaVideoProbeControl_iid - - \c org.qt-project.qt.mediavideoprobecontrol/5.0 - - Defines the interface name of the QMediaVideoProbeControl class. - - \relates QMediaVideoProbeControl -*/ - -/*! - Create a new media video probe control object with the given \a parent. -*/ -QMediaVideoProbeControl::QMediaVideoProbeControl(QObject *parent) - : QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! Destroys this video probe control */ -QMediaVideoProbeControl::~QMediaVideoProbeControl() -{ -} - -/*! - \fn QMediaVideoProbeControl::videoFrameProbed(const QVideoFrame &frame) - - This signal should be emitted when a video \a frame is processed in the - media service. -*/ - -/*! - \fn QMediaVideoProbeControl::flush() - - This signal should be emitted when it is required to release all frames. -*/ - -QT_END_NAMESPACE - -#include "moc_qmediavideoprobecontrol.cpp" diff --git a/src/multimedia/controls/qmediavideoprobecontrol.h b/src/multimedia/controls/qmediavideoprobecontrol.h deleted file mode 100644 index 363975055..000000000 --- a/src/multimedia/controls/qmediavideoprobecontrol.h +++ /dev/null @@ -1,70 +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 QMEDIAVIDEOPROBECONTROL_H -#define QMEDIAVIDEOPROBECONTROL_H - -#include <QtMultimedia/qmediacontrol.h> - -QT_BEGIN_NAMESPACE - -class QVideoFrame; -class Q_MULTIMEDIA_EXPORT QMediaVideoProbeControl : public QMediaControl -{ - Q_OBJECT -public: - virtual ~QMediaVideoProbeControl(); - -Q_SIGNALS: - void videoFrameProbed(const QVideoFrame &frame); - void flush(); - -protected: - explicit QMediaVideoProbeControl(QObject *parent = nullptr); -}; - -#define QMediaVideoProbeControl_iid "org.qt-project.qt.mediavideoprobecontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMediaVideoProbeControl, QMediaVideoProbeControl_iid) - -QT_END_NAMESPACE - - -#endif // QMEDIAVIDEOPROBECONTROL_H diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp deleted file mode 100644 index f01ffec38..000000000 --- a/src/multimedia/controls/qmetadatareadercontrol.cpp +++ /dev/null @@ -1,149 +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 "qmediacontrol_p.h" -#include <qmetadatareadercontrol.h> - -QT_BEGIN_NAMESPACE - - -/*! - \class QMetaDataReaderControl - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - - \brief The QMetaDataReaderControl class provides read access to the - meta-data of a QMediaService's media. - - If a QMediaService can provide read or write access to the meta-data of - its current media it will implement QMetaDataReaderControl. This control - provides functions for both retrieving and setting meta-data values. - Meta-data may be addressed by the keys defined in the - QMediaMetaData namespace. - - The functionality provided by this control is exposed to application - code by the meta-data members of QMediaObject, and so meta-data access - is potentially available in any of the media object classes. Any media - service may implement QMetaDataReaderControl. - - The interface name of QMetaDataReaderControl is - \c org.qt-project.qt.metadatareadercontrol/5.0 as defined in - QMetaDataReaderControl_iid. - - \sa QMediaService::requestControl(), QMediaObject -*/ - -/*! - \macro QMetaDataReaderControl_iid - - \c org.qt-project.qt.metadatareadercontrol/5.0 - - Defines the interface name of the QMetaDataReaderControl class. - - \relates QMetaDataReaderControl -*/ - -/*! - Construct a QMetaDataReaderControl with \a parent. This class is meant as a base class - for service specific meta data providers so this constructor is protected. -*/ - -QMetaDataReaderControl::QMetaDataReaderControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destroy the meta-data object. -*/ - -QMetaDataReaderControl::~QMetaDataReaderControl() -{ -} - -/*! - \fn bool QMetaDataReaderControl::isMetaDataAvailable() const - - Identifies if meta-data is available from a media service. - - Returns true if the meta-data is available and false otherwise. -*/ - -/*! - \fn QVariant QMetaDataReaderControl::metaData(const QString &key) const - - Returns the meta-data for the given \a key. -*/ - -/*! - \fn QMetaDataReaderControl::availableMetaData() const - - Returns a list of keys there is meta-data available for. -*/ - -/*! - \fn void QMetaDataReaderControl::metaDataChanged() - - Signal the changes of meta-data. - - If multiple meta-data elements are changed, - metaDataChanged(const QString &key, const QVariant &value) signal is emitted - for each of them with metaDataChanged() changed emitted once. -*/ - -/*! - \fn void QMetaDataReaderControl::metaDataChanged(const QString &key, const QVariant &value) - - Signal the changes of one meta-data element \a value with the given \a key. -*/ - -/*! - \fn void QMetaDataReaderControl::metaDataAvailableChanged(bool available) - - Signal the availability of meta-data has changed, \a available will - be true if the multimedia object has meta-data. -*/ - -QT_END_NAMESPACE - -#include "moc_qmetadatareadercontrol.cpp" diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h deleted file mode 100644 index b13c7ea00..000000000 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ /dev/null @@ -1,81 +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 QMETADATAREADERCONTROL_H -#define QMETADATAREADERCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaobject.h> - -#include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QMetaDataReaderControl : public QMediaControl -{ - Q_OBJECT -public: - ~QMetaDataReaderControl(); - - virtual bool isMetaDataAvailable() const = 0; - - virtual QVariant metaData(const QString &key) const = 0; - virtual QStringList availableMetaData() const = 0; - -Q_SIGNALS: - void metaDataChanged(); - void metaDataChanged(const QString &key, const QVariant &value); - - void metaDataAvailableChanged(bool available); - -protected: - explicit QMetaDataReaderControl(QObject *parent = nullptr); -}; - -#define QMetaDataReaderControl_iid "org.qt-project.qt.metadatareadercontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMetaDataReaderControl, QMetaDataReaderControl_iid) - -QT_END_NAMESPACE - - -#endif // QMETADATAPROVIDER_H diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp deleted file mode 100644 index 6221edaa1..000000000 --- a/src/multimedia/controls/qmetadatawritercontrol.cpp +++ /dev/null @@ -1,169 +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 "qmediacontrol_p.h" -#include <qmetadatawritercontrol.h> - -QT_BEGIN_NAMESPACE - - -/*! - \class QMetaDataWriterControl - \obsolete - \inmodule QtMultimedia - - - \ingroup multimedia_control - - - \brief The QMetaDataWriterControl class provides write access to the - meta-data of a QMediaService's media. - - If a QMediaService can provide write access to the meta-data of its - current media it will implement QMetaDataWriterControl. This control - provides functions for both retrieving and setting meta-data values. - Meta-data may be addressed by the keys defined in the - QMediaMetaData namespace. - - The functionality provided by this control is exposed to application code - by the meta-data members of QMediaObject, and so meta-data access is - potentially available in any of the media object classes. Any media - service may implement QMetaDataControl. - - The interface name of QMetaDataWriterControl is \c org.qt-project.qt.metadatawritercontrol/5.0 as - defined in QMetaDataWriterControl_iid. - - \sa QMediaService::requestControl(), QMediaObject -*/ - -/*! - \macro QMetaDataWriterControl_iid - - \c org.qt-project.qt.metadatawritercontrol/5.0 - - Defines the interface name of the QMetaDataWriterControl class. - - \relates QMetaDataWriterControl -*/ - -/*! - Construct a QMetaDataWriterControl with \a parent. This class is meant as a base class - for service specific meta data providers so this constructor is protected. -*/ - -QMetaDataWriterControl::QMetaDataWriterControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) -{ -} - -/*! - Destroy the meta-data writer control. -*/ - -QMetaDataWriterControl::~QMetaDataWriterControl() -{ -} - -/*! - \fn bool QMetaDataWriterControl::isMetaDataAvailable() const - - Identifies if meta-data is available from a media service. - - Returns true if the meta-data is available and false otherwise. -*/ - -/*! - \fn bool QMetaDataWriterControl::isWritable() const - - Identifies if a media service's meta-data can be edited. - - Returns true if the meta-data is writable and false otherwise. -*/ - -/*! - \fn QVariant QMetaDataWriterControl::metaData(const QString &key) const - - Returns the meta-data for the given \a key. -*/ - -/*! - \fn void QMetaDataWriterControl::setMetaData(const QString &key, const QVariant &value) - - Sets the \a value of the meta-data element with the given \a key. -*/ - -/*! - \fn QMetaDataWriterControl::availableMetaData() const - - Returns a list of keys there is meta-data available for. -*/ - -/*! - \fn void QMetaDataWriterControl::metaDataChanged() - - Signal the changes of meta-data. - - If multiple meta-data elements are changed, - metaDataChanged(const QString &key, const QVariant &value) signal is emitted - for each of them with metaDataChanged() changed emitted once. -*/ - -/*! - \fn void QMetaDataWriterControl::metaDataChanged(const QString &key, const QVariant &value) - - Signal the changes of one meta-data element \a value with the given \a key. -*/ - -/*! - \fn void QMetaDataWriterControl::metaDataAvailableChanged(bool available) - - Signal the availability of meta-data has changed, \a available will - be true if the multimedia object has meta-data. -*/ - -/*! - \fn void QMetaDataWriterControl::writableChanged(bool writable) - - Signal a change in the writable status of meta-data, \a writable will be - true if meta-data elements can be added or adjusted. -*/ - -QT_END_NAMESPACE - -#include "moc_qmetadatawritercontrol.cpp" diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h deleted file mode 100644 index a1d4449c3..000000000 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ /dev/null @@ -1,84 +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 QMETADATAWRITERCONTROL_H -#define QMETADATAWRITERCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaobject.h> - -#include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmultimedia.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QMetaDataWriterControl : public QMediaControl -{ - Q_OBJECT -public: - ~QMetaDataWriterControl(); - - virtual bool isWritable() const = 0; - virtual bool isMetaDataAvailable() const = 0; - - virtual QVariant metaData(const QString &key) const = 0; - virtual void setMetaData(const QString &key, const QVariant &value) = 0; - virtual QStringList availableMetaData() const = 0; - -Q_SIGNALS: - void metaDataChanged(); - void metaDataChanged(const QString &key, const QVariant &value); - - void writableChanged(bool writable); - void metaDataAvailableChanged(bool available); - -protected: - explicit QMetaDataWriterControl(QObject *parent = nullptr); -}; - -#define QMetaDataWriterControl_iid "org.qt-project.qt.metadatawritercontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QMetaDataWriterControl, QMetaDataWriterControl_iid) - -QT_END_NAMESPACE - - -#endif diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.cpp b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp deleted file mode 100644 index 420ba9150..000000000 --- a/src/multimedia/controls/qvideodeviceselectorcontrol.cpp +++ /dev/null @@ -1,143 +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 "qvideodeviceselectorcontrol.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QVideoDeviceSelectorControl - \obsolete - - \brief The QVideoDeviceSelectorControl class provides an video device selector media control. - \inmodule QtMultimedia - - - \ingroup multimedia_control - - The QVideoDeviceSelectorControl class provides descriptions of the video devices - available on a system and allows one to be selected as the endpoint of a - media service. - - The interface name of QVideoDeviceSelectorControl is \c org.qt-project.qt.videodeviceselectorcontrol/5.0 as - defined in QVideoDeviceSelectorControl_iid. -*/ - -/*! - \macro QVideoDeviceSelectorControl_iid - - \c org.qt-project.qt.videodeviceselectorcontrol/5.0 - - Defines the interface name of the QVideoDeviceSelectorControl class. - - \relates QVideoDeviceSelectorControl -*/ - -/*! - Constructs a video device selector control with the given \a parent. -*/ -QVideoDeviceSelectorControl::QVideoDeviceSelectorControl(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys a video device selector control. -*/ -QVideoDeviceSelectorControl::~QVideoDeviceSelectorControl() -{ -} - -/*! - \fn QVideoDeviceSelectorControl::deviceCount() const - - Returns the number of available video devices; -*/ - -/*! - \fn QVideoDeviceSelectorControl::deviceName(int index) const - - Returns the name of the video device at \a index. -*/ - -/*! - \fn QVideoDeviceSelectorControl::deviceDescription(int index) const - - Returns a description of the video device at \a index. -*/ - -/*! - \fn QVideoDeviceSelectorControl::defaultDevice() const - - Returns the index of the default video device. -*/ - -/*! - \fn QVideoDeviceSelectorControl::selectedDevice() const - - Returns the index of the selected video device. -*/ - -/*! - \fn QVideoDeviceSelectorControl::setSelectedDevice(int index) - - Sets the selected video device \a index. -*/ - -/*! - \fn QVideoDeviceSelectorControl::devicesChanged() - - Signals that the list of available video devices has changed. -*/ - -/*! - \fn QVideoDeviceSelectorControl::selectedDeviceChanged(int index) - - Signals that the selected video device \a index has changed. -*/ - -/*! - \fn QVideoDeviceSelectorControl::selectedDeviceChanged(const QString &name) - - Signals that the selected video device \a name has changed. -*/ - -QT_END_NAMESPACE - -#include "moc_qvideodeviceselectorcontrol.cpp" diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.h b/src/multimedia/controls/qvideodeviceselectorcontrol.h deleted file mode 100644 index 4697196ce..000000000 --- a/src/multimedia/controls/qvideodeviceselectorcontrol.h +++ /dev/null @@ -1,82 +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 QVIDEODEVICESELECTORCONTROL_H -#define QVIDEODEVICESELECTORCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QVideoDeviceSelectorControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QVideoDeviceSelectorControl(); - - virtual int deviceCount() const = 0; - - virtual QString deviceName(int index) const = 0; - virtual QString deviceDescription(int index) const = 0; - - virtual int defaultDevice() const = 0; - virtual int selectedDevice() const = 0; - -public Q_SLOTS: - virtual void setSelectedDevice(int index) = 0; - -Q_SIGNALS: - void selectedDeviceChanged(int index); - void selectedDeviceChanged(const QString &name); - void devicesChanged(); - -protected: - explicit QVideoDeviceSelectorControl(QObject *parent = nullptr); -}; - -#define QVideoDeviceSelectorControl_iid "org.qt-project.qt.videodeviceselectorcontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QVideoDeviceSelectorControl, QVideoDeviceSelectorControl_iid) - -QT_END_NAMESPACE - -#endif // QVIDEODEVICESELECTORCONTROL_H diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.cpp b/src/multimedia/controls/qvideoencodersettingscontrol.cpp deleted file mode 100644 index 64643f6db..000000000 --- a/src/multimedia/controls/qvideoencodersettingscontrol.cpp +++ /dev/null @@ -1,161 +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 "qvideoencodersettingscontrol.h" -#include <QtCore/qstringlist.h> -#include <QtCore/qvariant.h> - -QT_BEGIN_NAMESPACE - -/*! - \class QVideoEncoderSettingsControl - \obsolete - - \inmodule QtMultimedia - - - \ingroup multimedia_control - - \brief The QVideoEncoderSettingsControl class provides access to the settings - of a media service that performs video encoding. - - If a QMediaService supports encoding video data it will implement - QVideoEncoderSettingsControl. This control provides information about the limits - of restricted video encoder options and allows the selection of a set of - video encoder settings as specified in a QVideoEncoderSettings object. - - The functionality provided by this control is exposed to application code - through the QMediaRecorder class. - - The interface name of QVideoEncoderSettingsControl is \c org.qt-project.qt.videoencodersettingscontrol/5.0 as - defined in QVideoEncoderSettingsControl_iid. - - \sa QMediaRecorder, QVideoEncoderSettings, QMediaService::requestControl() -*/ - -/*! - \macro QVideoEncoderSettingsControl_iid - - \c org.qt-project.qt.videoencodersettingscontrol/5.0 - - Defines the interface name of the QVideoEncoderSettingsControl class. - - \relates QVideoEncoderSettingsControl -*/ - -/*! - Create a new video encoder settings control object with the given \a parent. -*/ -QVideoEncoderSettingsControl::QVideoEncoderSettingsControl(QObject *parent) - :QMediaControl(parent) -{ -} - -/*! - Destroys a video encoder settings control. -*/ -QVideoEncoderSettingsControl::~QVideoEncoderSettingsControl() -{ -} - -/*! - \fn QVideoEncoderSettingsControl::supportedVideoCodecs() const - - Returns the list of supported video codecs. -*/ - -/*! - \fn QVideoEncoderSettingsControl::videoCodecDescription(const QString &codec) const - - Returns a description of a video \a codec. -*/ - -/*! - \fn QVideoEncoderSettingsControl::supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = 0) const - - Returns a list of supported resolutions. - - If non null video \a settings parameter is passed, - the returned list is reduced to resolution supported with partial settings like - \l {QVideoEncoderSettings::setCodec()}{video codec} or - \l {QVideoEncoderSettings::setFrameRate()}{frame rate} applied. - - If the encoder supports arbitrary resolutions within the supported resolutions range, - *\a continuous is set to true, otherwise *\a continuous is set to false. - - \sa QVideoEncoderSettings::resolution() -*/ - -/*! - \fn QVideoEncoderSettingsControl::supportedFrameRates(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = 0) const - - Returns a list of supported frame rates. - - If non null video \a settings parameter is passed, - the returned list is reduced to frame rates supported with partial settings like - \l {QVideoEncoderSettings::setCodec()}{video codec} or - \l {QVideoEncoderSettings::setResolution()}{video resolution} applied. - - If the encoder supports arbitrary frame rates within the supported range, - *\a continuous is set to true, otherwise *\a continuous is set to false. - - \sa QVideoEncoderSettings::frameRate() -*/ - -/*! - \fn QVideoEncoderSettingsControl::videoSettings() const - - Returns the video encoder settings. - - The returned value may be different tha passed to QVideoEncoderSettingsControl::setVideoSettings() - if the settings contains the default or undefined parameters. - In this case if the undefined parameters are already resolved, they should be returned. -*/ - -/*! - \fn QVideoEncoderSettingsControl::setVideoSettings(const QVideoEncoderSettings &settings) - - Sets the selected video encoder \a settings. -*/ - -QT_END_NAMESPACE - -#include "moc_qvideoencodersettingscontrol.cpp" diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.h b/src/multimedia/controls/qvideoencodersettingscontrol.h deleted file mode 100644 index ac13833d1..000000000 --- a/src/multimedia/controls/qvideoencodersettingscontrol.h +++ /dev/null @@ -1,88 +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 QVIDEOENCODERSETTINGSCONTROL_H -#define QVIDEOENCODERSETTINGSCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediarecorder.h> - -#include <QtCore/qpair.h> -#include <QtCore/qsize.h> - -QT_BEGIN_NAMESPACE - -class QByteArray; -QT_END_NAMESPACE - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QVideoEncoderSettingsControl : public QMediaControl -{ - Q_OBJECT - -public: - virtual ~QVideoEncoderSettingsControl(); - - virtual QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings, - bool *continuous = nullptr) const = 0; - - virtual QList<qreal> supportedFrameRates(const QVideoEncoderSettings &settings, - bool *continuous = nullptr) const = 0; - - virtual QStringList supportedVideoCodecs() const = 0; - virtual QString videoCodecDescription(const QString &codec) const = 0; - - virtual QVideoEncoderSettings videoSettings() const = 0; - virtual void setVideoSettings(const QVideoEncoderSettings &settings) = 0; - -protected: - explicit QVideoEncoderSettingsControl(QObject *parent = nullptr); -}; - -#define QVideoEncoderSettingsControl_iid "org.qt-project.qt.videoencodersettingscontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QVideoEncoderSettingsControl, QVideoEncoderSettingsControl_iid) - -QT_END_NAMESPACE - - -#endif diff --git a/src/multimedia/controls/qvideorenderercontrol.cpp b/src/multimedia/controls/qvideorenderercontrol.cpp deleted file mode 100644 index eee20d59e..000000000 --- a/src/multimedia/controls/qvideorenderercontrol.cpp +++ /dev/null @@ -1,109 +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 "qvideorenderercontrol.h" - -#include "qmediacontrol_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QVideoRendererControl - \obsolete - - \inmodule QtMultimedia - \brief The QVideoRendererControl class provides a media control for rendering video to a QAbstractVideoSurface. - - - \ingroup multimedia_control - - Using the surface() property of QVideoRendererControl a - QAbstractVideoSurface may be set as the video render target of a - QMediaService. - - \snippet multimedia-snippets/video.cpp Video renderer control - - QVideoRendererControl is one of a number of possible video output controls. - - The interface name of QVideoRendererControl is \c org.qt-project.qt.videorenderercontrol/5.0 as - defined in QVideoRendererControl_iid. - - \sa QMediaService::requestControl(), QVideoWidget -*/ - -/*! - \macro QVideoRendererControl_iid - - \c org.qt-project.qt.videorenderercontrol/5.0 - - Defines the interface name of the QVideoRendererControl class. - - \relates QVideoRendererControl -*/ - -/*! - Constructs a new video renderer media end point with the given \a parent. -*/ -QVideoRendererControl::QVideoRendererControl(QObject *parent) - : QMediaControl(parent) -{ -} - -/*! - Destroys a video renderer media end point. -*/ -QVideoRendererControl::~QVideoRendererControl() -{ -} - -/*! - \fn QVideoRendererControl::surface() const - - Returns the surface a video producer renders to. -*/ - -/*! - \fn QVideoRendererControl::setSurface(QAbstractVideoSurface *surface) - - Sets the \a surface a video producer renders to. -*/ - -QT_END_NAMESPACE - -#include "moc_qvideorenderercontrol.cpp" diff --git a/src/multimedia/controls/qvideorenderercontrol.h b/src/multimedia/controls/qvideorenderercontrol.h deleted file mode 100644 index 87552271a..000000000 --- a/src/multimedia/controls/qvideorenderercontrol.h +++ /dev/null @@ -1,68 +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 QVIDEORENDERERCONTROL_H -#define QVIDEORENDERERCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> - -QT_BEGIN_NAMESPACE - -class QAbstractVideoSurface; -class Q_MULTIMEDIA_EXPORT QVideoRendererControl : public QMediaControl -{ - Q_OBJECT - -public: - ~QVideoRendererControl(); - - virtual QAbstractVideoSurface *surface() const = 0; - virtual void setSurface(QAbstractVideoSurface *surface) = 0; - -protected: - explicit QVideoRendererControl(QObject *parent = nullptr); -}; - -#define QVideoRendererControl_iid "org.qt-project.qt.videorenderercontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QVideoRendererControl, QVideoRendererControl_iid) - -QT_END_NAMESPACE - - -#endif // QVIDEORENDERERCONTROL_H diff --git a/src/multimedia/controls/qvideowindowcontrol.cpp b/src/multimedia/controls/qvideowindowcontrol.cpp deleted file mode 100644 index a6b2bf407..000000000 --- a/src/multimedia/controls/qvideowindowcontrol.cpp +++ /dev/null @@ -1,259 +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 "qvideowindowcontrol.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QVideoWindowControl - \obsolete - - \inmodule QtMultimedia - - \ingroup multimedia_control - \brief The QVideoWindowControl class provides a media control for rendering video to a window. - - - The winId() property QVideoWindowControl allows a platform specific window - ID to be set as the video render target of a QMediaService. The - displayRect() property is used to set the region of the window the video - should be rendered to, and the aspectRatioMode() property indicates how the - video should be scaled to fit the displayRect(). - - \snippet multimedia-snippets/video.cpp Video window control - - QVideoWindowControl is one of a number of possible video output controls. - - The interface name of QVideoWindowControl is \c org.qt-project.qt.videowindowcontrol/5.0 as - defined in QVideoWindowControl_iid. - - \sa QMediaService::requestControl(), QVideoWidget -*/ - -/*! - \macro QVideoWindowControl_iid - - \c org.qt-project.qt.videowindowcontrol/5.0 - - Defines the interface name of the QVideoWindowControl class. - - \relates QVideoWindowControl -*/ - -/*! - Constructs a new video window control with the given \a parent. -*/ -QVideoWindowControl::QVideoWindowControl(QObject *parent) - : QMediaControl(parent) -{ -} - -/*! - Destroys a video window control. -*/ -QVideoWindowControl::~QVideoWindowControl() -{ -} - -/*! - \fn QVideoWindowControl::winId() const - - Returns the ID of the window a video overlay end point renders to. -*/ - -/*! - \fn QVideoWindowControl::setWinId(WId id) - - Sets the \a id of the window a video overlay end point renders to. -*/ - -/*! - \fn QVideoWindowControl::displayRect() const - Returns the sub-rect of a window where video is displayed. -*/ - -/*! - \fn QVideoWindowControl::setDisplayRect(const QRect &rect) - Sets the sub-\a rect of a window where video is displayed. -*/ - -/*! - \fn QVideoWindowControl::isFullScreen() const - - Identifies if a video overlay is a fullScreen overlay. - - Returns true if the video overlay is fullScreen, and false otherwise. -*/ - -/*! - \fn QVideoWindowControl::setFullScreen(bool fullScreen) - - Sets whether a video overlay is a \a fullScreen overlay. -*/ - -/*! - \fn QVideoWindowControl::fullScreenChanged(bool fullScreen) - - Signals that the \a fullScreen state of a video overlay has changed. -*/ - -/*! - \fn QVideoWindowControl::repaint() - - Repaints the last frame. -*/ - -/*! - \fn QVideoWindowControl::nativeSize() const - - Returns a suggested size for the video display based on the resolution and aspect ratio of the - video. -*/ - -/*! - \fn QVideoWindowControl::nativeSizeChanged() - - Signals that the native dimensions of the video have changed. -*/ - - -/*! - \fn QVideoWindowControl::aspectRatioMode() const - - Returns how video is scaled to fit the display region with respect to its aspect ratio. -*/ - -/*! - \fn QVideoWindowControl::setAspectRatioMode(Qt::AspectRatioMode mode) - - Sets the aspect ratio \a mode which determines how video is scaled to the fit the display region - with respect to its aspect ratio. -*/ - -/*! - \fn QVideoWindowControl::brightness() const - - Returns the brightness adjustment applied to a video overlay. - - Valid brightness values range between -100 and 100, the default is 0. -*/ - -/*! - \fn QVideoWindowControl::setBrightness(int brightness) - - Sets a \a brightness adjustment for a video overlay. - - Valid brightness values range between -100 and 100, the default is 0. -*/ - -/*! - \fn QVideoWindowControl::brightnessChanged(int brightness) - - Signals that a video overlay's \a brightness adjustment has changed. -*/ - -/*! - \fn QVideoWindowControl::contrast() const - - Returns the contrast adjustment applied to a video overlay. - - Valid contrast values range between -100 and 100, the default is 0. -*/ - -/*! - \fn QVideoWindowControl::setContrast(int contrast) - - Sets the \a contrast adjustment for a video overlay. - - Valid contrast values range between -100 and 100, the default is 0. -*/ - -/*! - \fn QVideoWindowControl::contrastChanged(int contrast) - - Signals that a video overlay's \a contrast adjustment has changed. -*/ - -/*! - \fn QVideoWindowControl::hue() const - - Returns the hue adjustment applied to a video overlay. - - Value hue values range between -100 and 100, the default is 0. -*/ - -/*! - \fn QVideoWindowControl::setHue(int hue) - - Sets a \a hue adjustment for a video overlay. - - Valid hue values range between -100 and 100, the default is 0. -*/ - -/*! - \fn QVideoWindowControl::hueChanged(int hue) - - Signals that a video overlay's \a hue adjustment has changed. -*/ - -/*! - \fn QVideoWindowControl::saturation() const - - Returns the saturation adjustment applied to a video overlay. - - Value saturation values range between -100 and 100, the default is 0. -*/ - -/*! - \fn QVideoWindowControl::setSaturation(int saturation) - Sets a \a saturation adjustment for a video overlay. - - Valid saturation values range between -100 and 100, the default is 0. -*/ - -/*! - \fn QVideoWindowControl::saturationChanged(int saturation) - - Signals that a video overlay's \a saturation adjustment has changed. -*/ - -QT_END_NAMESPACE - -#include "moc_qvideowindowcontrol.cpp" diff --git a/src/multimedia/controls/qvideowindowcontrol.h b/src/multimedia/controls/qvideowindowcontrol.h deleted file mode 100644 index 510a29989..000000000 --- a/src/multimedia/controls/qvideowindowcontrol.h +++ /dev/null @@ -1,106 +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 QVIDEOWINDOWCONTROL_H -#define QVIDEOWINDOWCONTROL_H - -#include <QtMultimedia/qmediacontrol.h> -#include <QtCore/qrect.h> -#include <QtCore/qsize.h> -#include <QtGui/qwindowdefs.h> - -QT_BEGIN_NAMESPACE - -// Required for QDoc workaround -class QString; - -class Q_MULTIMEDIA_EXPORT QVideoWindowControl : public QMediaControl -{ - Q_OBJECT - -public: - ~QVideoWindowControl(); - - virtual WId winId() const = 0; - virtual void setWinId(WId id) = 0; - - virtual QRect displayRect() const = 0; - virtual void setDisplayRect(const QRect &rect) = 0; - - virtual bool isFullScreen() const = 0; - virtual void setFullScreen(bool fullScreen) = 0; - - virtual void repaint() = 0; - - virtual QSize nativeSize() const = 0; - - virtual Qt::AspectRatioMode aspectRatioMode() const = 0; - virtual void setAspectRatioMode(Qt::AspectRatioMode mode) = 0; - - virtual int brightness() const = 0; - virtual void setBrightness(int brightness) = 0; - - virtual int contrast() const = 0; - virtual void setContrast(int contrast) = 0; - - virtual int hue() const = 0; - virtual void setHue(int hue) = 0; - - virtual int saturation() const = 0; - virtual void setSaturation(int saturation) = 0; - -Q_SIGNALS: - void fullScreenChanged(bool fullScreen); - void brightnessChanged(int brightness); - void contrastChanged(int contrast); - void hueChanged(int hue); - void saturationChanged(int saturation); - void nativeSizeChanged(); - -protected: - explicit QVideoWindowControl(QObject *parent = nullptr); -}; - -#define QVideoWindowControl_iid "org.qt-project.qt.videowindowcontrol/5.0" -Q_MEDIA_DECLARE_CONTROL(QVideoWindowControl, QVideoWindowControl_iid) - -QT_END_NAMESPACE - - -#endif |