From 6b25a189ca4a9d547e15ed8225025f2c1f9de352 Mon Sep 17 00:00:00 2001 From: Jonas Rabbe Date: Fri, 14 Oct 2011 12:49:25 +1000 Subject: Copied ALSA config test into QtMultimedia module The config test which still exists in QtBase should be removed at a later date, together with pulseaudio and gstreamer config tests. Change-Id: I4bea45ab69d1bac10814fc60ecf24dbc859b0f20 Reviewed-on: http://codereview.qt-project.org/6643 Reviewed-by: Ling Hu Reviewed-by: Michael Goddard --- config.tests/alsa/alsa.pro | 13 +++++++++++ config.tests/alsa/alsatest.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++ src/multimedia/audio/audio.pri | 2 +- sync.profile | 1 + 4 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 config.tests/alsa/alsa.pro create mode 100644 config.tests/alsa/alsatest.cpp diff --git a/config.tests/alsa/alsa.pro b/config.tests/alsa/alsa.pro new file mode 100644 index 000000000..00f238650 --- /dev/null +++ b/config.tests/alsa/alsa.pro @@ -0,0 +1,13 @@ +TEMPLATE = app +DEPENDPATH += . +INCLUDEPATH += . + +requires(unix) + +SOURCES = alsatest.cpp + +CONFIG -= qt dylib +mac:CONFIG -= app_bundle + +LIBS+=-lasound + diff --git a/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp new file mode 100644 index 000000000..829977fca --- /dev/null +++ b/config.tests/alsa/alsatest.cpp @@ -0,0 +1,50 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#if (!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)) +#error "Alsa version found too old, require >= 1.0.10" +#endif + +int main(int argc,char **argv) +{ +} + diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri index 4bedbd4d5..86c379d65 100644 --- a/src/multimedia/audio/audio.pri +++ b/src/multimedia/audio/audio.pri @@ -47,7 +47,7 @@ unix:!mac { contains(config_test_pulseaudio, yes) { DEFINES += QT_NO_AUDIO_BACKEND } - else:contains(QT_CONFIG, alsa) { + else:contains(config_test_alsa, yes) { linux-*|freebsd-*|openbsd-* { DEFINES += HAS_ALSA PRIVATE_HEADERS += audio/qaudiooutput_alsa_p.h audio/qaudioinput_alsa_p.h audio/qaudiodeviceinfo_alsa_p.h diff --git a/sync.profile b/sync.profile index 41d2735a7..cd48b0b98 100644 --- a/sync.profile +++ b/sync.profile @@ -44,6 +44,7 @@ "evr" => {}, # Linux tests + "alsa" => {}, "gstreamer" => {}, "gstreamer_photography" => {}, "gstreamer_appsrc" => {}, -- cgit v1.2.3