diff options
Diffstat (limited to 'src/multimedia/audio/qaudiobuffer.h')
-rw-r--r-- | src/multimedia/audio/qaudiobuffer.h | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/src/multimedia/audio/qaudiobuffer.h b/src/multimedia/audio/qaudiobuffer.h index b4c58fe10..822619f31 100644 --- a/src/multimedia/audio/qaudiobuffer.h +++ b/src/multimedia/audio/qaudiobuffer.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) 2016 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 QAUDIOBUFFER_H #define QAUDIOBUFFER_H @@ -44,7 +8,7 @@ #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qaudio.h> +#include <QtMultimedia/qtaudio.h> #include <QtMultimedia/qaudioformat.h> QT_BEGIN_NAMESPACE @@ -113,7 +77,7 @@ public: return QtPrivate::AudioSampleFormatHelper<format>::Default; return channels[idx]; } - void setValue(QAudioFormat::AudioChannelPosition pos, value_type val) const { + void setValue(QAudioFormat::AudioChannelPosition pos, value_type val) { int idx = positionToIndex(pos); if (idx < 0) return; @@ -161,7 +125,7 @@ public: QAudioBuffer(QAudioBuffer &&other) noexcept = default; QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QAudioBuffer) void swap(QAudioBuffer &other) noexcept - { qSwap(d, other.d); } + { d.swap(other.d); } bool isValid() const noexcept { return d != nullptr; }; |