diff options
Diffstat (limited to 'src/multimedia/audio/qaudiodevice_p.h')
-rw-r--r-- | src/multimedia/audio/qaudiodevice_p.h | 58 |
1 files changed, 18 insertions, 40 deletions
diff --git a/src/multimedia/audio/qaudiodevice_p.h b/src/multimedia/audio/qaudiodevice_p.h index 9ab75800c..c59856d72 100644 --- a/src/multimedia/audio/qaudiodevice_p.h +++ b/src/multimedia/audio/qaudiodevice_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2022 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 QAUDIODEVICEINFO_P_H @@ -53,10 +17,11 @@ // #include <QtMultimedia/qaudiodevice.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE -class QAudioDevicePrivate : public QSharedData +class Q_MULTIMEDIA_EXPORT QAudioDevicePrivate : public QSharedData { public: QAudioDevicePrivate(const QByteArray &i, QAudioDevice::Mode m) @@ -64,7 +29,7 @@ public: mode(m) {} virtual ~QAudioDevicePrivate(); - QByteArray id; + QByteArray id; QAudioDevice::Mode mode = QAudioDevice::Output; bool isDefault = false; @@ -75,6 +40,19 @@ public: int minimumChannelCount = 0; int maximumChannelCount = 0; QList<QAudioFormat::SampleFormat> supportedSampleFormats; + QAudioFormat::ChannelConfig channelConfiguration = QAudioFormat::ChannelConfigUnknown; + + bool operator == (const QAudioDevicePrivate &other) const + { + return id == other.id && mode == other.mode && isDefault == other.isDefault + && preferredFormat == other.preferredFormat && description == other.description + && minimumSampleRate == other.minimumSampleRate + && maximumSampleRate == other.maximumSampleRate + && minimumChannelCount == other.minimumChannelCount + && maximumChannelCount == other.maximumChannelCount + && supportedSampleFormats == other.supportedSampleFormats + && channelConfiguration == other.channelConfiguration; + } QAudioDevice create() { return QAudioDevice(this); } }; |