diff options
author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-06-10 10:46:54 +0200 |
---|---|---|
committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-06-14 19:57:51 +0000 |
commit | 22d2780cfe3a30fc33894efb8e3f7b25cfeac0fd (patch) | |
tree | c5930412f4094053831a3eadfb8c6020f8c3d0d6 | |
parent | 8815920e7f2351ddb989f2f6ee1616f418e638c0 (diff) | |
download | qtmultimedia-22d2780cfe3a30fc33894efb8e3f7b25cfeac0fd.tar.gz |
Add config test for wasapi plugin
The wasapi audio plugin can also be used on desktop versions of Windows.
The support has been experimental so far and will now be enabled in case
the SDK contains support for it.
Unfortunately MinGW does not provide Microsoft::WRL::RuntimeClass and
IActivateAudioInterfaceCompletionHandler, hence we need to disable the
plugin currently for it.
Change-Id: I2be6e99810d462507112465a2084a2d72c3c62f0
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
-rw-r--r-- | config.tests/wasapi/main.cpp | 53 | ||||
-rw-r--r-- | config.tests/wasapi/wasapi.pro | 2 | ||||
-rw-r--r-- | qtmultimedia.pro | 1 | ||||
-rw-r--r-- | src/plugins/plugins.pro | 7 |
4 files changed, 61 insertions, 2 deletions
diff --git a/config.tests/wasapi/main.cpp b/config.tests/wasapi/main.cpp new file mode 100644 index 000000000..85bef127b --- /dev/null +++ b/config.tests/wasapi/main.cpp @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtMultimedia module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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 General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** 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-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <Audioclient.h> +#include <wrl.h> +#include <mmdeviceapi.h> + +class AudioInterface : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags + <Microsoft::WRL::Delegate>, Microsoft::WRL::FtmBase, IActivateAudioInterfaceCompletionHandler> +{ +public: + explicit AudioInterface() { } + ~AudioInterface() { } + + virtual HRESULT STDMETHODCALLTYPE ActivateCompleted(IActivateAudioInterfaceAsyncOperation *) { } +}; + +int main(int, char**) +{ + IUnknown *aInterface = nullptr; + IAudioClient* client; + aInterface->QueryInterface(IID_PPV_ARGS(&client)); + + WAVEFORMATEX *format; + client->GetMixFormat(&format); + + return 0; +} diff --git a/config.tests/wasapi/wasapi.pro b/config.tests/wasapi/wasapi.pro new file mode 100644 index 000000000..4294c4775 --- /dev/null +++ b/config.tests/wasapi/wasapi.pro @@ -0,0 +1,2 @@ +SOURCES += main.cpp +CONFIG += console diff --git a/qtmultimedia.pro b/qtmultimedia.pro index 98bb3152f..8101d63eb 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -9,6 +9,7 @@ win32 { qtCompileTest(evr) qtCompileTest(wmsdk) contains(QT_CONFIG, wmf-backend): qtCompileTest(wmf) + qtCompileTest(wasapi) } else:mac { qtCompileTest(avfoundation) } else:qnx { diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 8cc925bc2..ecfd8df3e 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -25,6 +25,10 @@ qnx:!blackberry { SUBDIRS += qnx-audio } +win32 { + config_wasapi: SUBDIRS += wasapi +} + win32:!winrt { SUBDIRS += audiocapture \ windowsaudio @@ -34,8 +38,7 @@ win32:!winrt { } winrt { - SUBDIRS += wasapi \ - winrt + SUBDIRS += winrt } unix:!mac:!android { |