diff options
Diffstat (limited to 'src/multimedia/windows/qwindowsmediadevices_p.h')
-rw-r--r-- | src/multimedia/windows/qwindowsmediadevices_p.h | 63 |
1 files changed, 20 insertions, 43 deletions
diff --git a/src/multimedia/windows/qwindowsmediadevices_p.h b/src/multimedia/windows/qwindowsmediadevices_p.h index da5aaf18c..c82be8a0d 100644 --- a/src/multimedia/windows/qwindowsmediadevices_p.h +++ b/src/multimedia/windows/qwindowsmediadevices_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 QWINDOWSMEDIADEVICES_H #define QWINDOWSMEDIADEVICES_H @@ -52,10 +16,13 @@ // #include <private/qplatformmediadevices_p.h> -#include <private/qwindowsiupointer_p.h> +#include <private/qcomptr_p.h> +#include <QtCore/private/qfunctions_win_p.h> +#include <private/qwindowsmediafoundation_p.h> #include <qaudiodevice.h> +struct IAudioClient3; struct IMMDeviceEnumerator; QT_BEGIN_NAMESPACE @@ -71,14 +38,24 @@ public: QList<QAudioDevice> audioInputs() const override; QList<QAudioDevice> audioOutputs() const override; - QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override; - QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override; + QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) override; + QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) override; + + void prepareAudio() override; private: + QComHelper m_comRuntime; + QMFRuntimeInit m_wmfRuntime{ QWindowsMediaFoundation::instance() }; QList<QAudioDevice> availableDevices(QAudioDevice::Mode mode) const; - QWindowsIUPointer<IMMDeviceEnumerator> m_deviceEnumerator; - QWindowsIUPointer<CMMNotificationClient> m_notificationClient; + ComPtr<IMMDeviceEnumerator> m_deviceEnumerator; + ComPtr<CMMNotificationClient> m_notificationClient; + // The "warm-up" audio client is required to run in the background in order to keep audio engine + // ready for audio output immediately after creating any other subsequent audio client. + ComPtr<IAudioClient3> m_warmUpAudioClient; + std::atomic_bool m_isAudioClientWarmedUp = false; friend CMMNotificationClient; }; |