diff options
Diffstat (limited to 'src/multimedia/wasm/qwasmaudiosink_p.h')
-rw-r--r-- | src/multimedia/wasm/qwasmaudiosink_p.h | 51 |
1 files changed, 8 insertions, 43 deletions
diff --git a/src/multimedia/wasm/qwasmaudiosink_p.h b/src/multimedia/wasm/qwasmaudiosink_p.h index 1c75ec258..975b7f6cc 100644 --- a/src/multimedia/wasm/qwasmaudiosink_p.h +++ b/src/multimedia/wasm/qwasmaudiosink_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 QWASMAUDIOSINK_H #define QWASMAUDIOSINK_H @@ -66,12 +30,13 @@ class QWasmAudioSink : public QPlatformAudioSink QByteArray m_name; ALData *aldata = nullptr; - QTimer m_timer; + QTimer *m_timer = nullptr; QIODevice *m_device = nullptr; QAudioFormat m_format; QAudio::Error m_error = QAudio::NoError; bool m_running = false; QAudio::State m_state = QAudio::StoppedState; + QAudio::State m_suspendedInState = QAudio::SuspendedState; int m_bufferSize = 0; quint64 m_processed = 0; QElapsedTimer m_elapsedTimer; @@ -94,7 +59,7 @@ private slots: void setError(QAudio::Error); public: - QWasmAudioSink(const QByteArray &device); + QWasmAudioSink(const QByteArray &device, QObject *parent); ~QWasmAudioSink(); public: @@ -105,9 +70,9 @@ public: void reset() override; void suspend() override; void resume() override; - int bytesFree() const override; - void setBufferSize(int value) override; - int bufferSize() const override; + qsizetype bytesFree() const override; + void setBufferSize(qsizetype value) override; + qsizetype bufferSize() const override; qint64 processedUSecs() const override; QAudio::Error error() const override; QAudio::State state() const override; |