diff options
Diffstat (limited to 'src/plugins/multimedia/android/qandroidintegration_p.h')
-rw-r--r-- | src/plugins/multimedia/android/qandroidintegration_p.h | 64 |
1 files changed, 13 insertions, 51 deletions
diff --git a/src/plugins/multimedia/android/qandroidintegration_p.h b/src/plugins/multimedia/android/qandroidintegration_p.h index 3c6dde15f..9ef5a3267 100644 --- a/src/plugins/multimedia/android/qandroidintegration_p.h +++ b/src/plugins/multimedia/android/qandroidintegration_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 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$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QANDROIDINTEGRATION_H #define QANDROIDINTEGRATION_H @@ -61,24 +25,22 @@ class QAndroidIntegration : public QPlatformMediaIntegration { public: QAndroidIntegration(); - ~QAndroidIntegration(); - QPlatformMediaFormatInfo *formatInfo() override; + QMaybe<QPlatformAudioDecoder *> createAudioDecoder(QAudioDecoder *decoder) override; + QMaybe<QPlatformMediaCaptureSession *> createCaptureSession() override; + QMaybe<QPlatformMediaPlayer *> createPlayer(QMediaPlayer *player) override; + QMaybe<QPlatformCamera *> createCamera(QCamera *camera) override; + QMaybe<QPlatformMediaRecorder *> createRecorder(QMediaRecorder *recorder) override; + QMaybe<QPlatformImageCapture *> createImageCapture(QImageCapture *imageCapture) override; - QPlatformAudioDecoder *createAudioDecoder(QAudioDecoder *decoder) override; - QPlatformMediaCaptureSession *createCaptureSession() override; - QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override; - QPlatformCamera *createCamera(QCamera *camera) override; - QPlatformMediaRecorder *createRecorder(QMediaRecorder *recorder) override; - QPlatformImageCapture *createImageCapture(QImageCapture *imageCapture) override; + QMaybe<QPlatformAudioOutput *> createAudioOutput(QAudioOutput *q) override; + QMaybe<QPlatformAudioInput *> createAudioInput(QAudioInput *audioInput) override; - QPlatformAudioOutput *createAudioOutput(QAudioOutput *q) override; - QPlatformAudioInput *createAudioInput(QAudioInput *audioInput) override; - - QPlatformVideoSink *createVideoSink(QVideoSink *) override; + QMaybe<QPlatformVideoSink *> createVideoSink(QVideoSink *) override; QList<QCameraDevice> videoInputs() override; - QPlatformMediaFormatInfo *m_formatInfo = nullptr; +protected: + QPlatformMediaFormatInfo *createFormatInfo() override; }; QT_END_NAMESPACE |