diff options
Diffstat (limited to 'src/plugins/multimedia/ffmpeg/qffmpegaudiodecoder_p.h')
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/qffmpegaudiodecoder_p.h | 48 |
1 files changed, 6 insertions, 42 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qffmpegaudiodecoder_p.h b/src/plugins/multimedia/ffmpeg/qffmpegaudiodecoder_p.h index 790a29b04..11816cd6f 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegaudiodecoder_p.h +++ b/src/plugins/multimedia/ffmpeg/qffmpegaudiodecoder_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 QFFMPEGAUDIODECODER_H #define QFFMPEGAUDIODECODER_H @@ -53,10 +17,7 @@ #include "private/qplatformaudiodecoder_p.h" #include <qffmpeg_p.h> - -#include <qmutex.h> #include <qurl.h> -#include <qqueue.h> QT_BEGIN_NAMESPACE @@ -89,11 +50,14 @@ public: public Q_SLOTS: void newAudioBuffer(const QAudioBuffer &b); void done(); + void errorSignal(int err, const QString &errorString); private: + using AudioDecoder = QFFmpeg::AudioDecoder; + QUrl m_url; QIODevice *m_sourceDevice = nullptr; - QFFmpeg::AudioDecoder *decoder = nullptr; + std::unique_ptr<AudioDecoder> m_decoder; QAudioFormat m_audioFormat; QAudioBuffer m_audioBuffer; |