From 680cc0c97431de03487206fee575fa89c24b8842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= Date: Sat, 5 Mar 2016 10:36:42 -0300 Subject: ALSA: simplify checking the available version. Make use of SND_LIB_VERSION instead of SND_LIB_[MAJOR MINOR SUBMINOR] in order to simplify the tests. Task-number: QTBUG-51681 Change-Id: Ib9f28ff15ddc643cc426ded3a5779fb4ff651139 Reviewed-by: Dmitry Shachnev Reviewed-by: Christian Stromme Reviewed-by: Oswald Buddenhagen --- src/plugins/alsa/qalsaaudiooutput.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/alsa/qalsaaudiooutput.cpp') diff --git a/src/plugins/alsa/qalsaaudiooutput.cpp b/src/plugins/alsa/qalsaaudiooutput.cpp index a382b666a..5702cfc78 100644 --- a/src/plugins/alsa/qalsaaudiooutput.cpp +++ b/src/plugins/alsa/qalsaaudiooutput.cpp @@ -306,7 +306,7 @@ bool QAlsaAudioOutput::open() QString dev = QString(QLatin1String(m_device.constData())); QList devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioOutput); if(dev.compare(QLatin1String("default")) == 0) { -#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) +#if SND_LIB_VERSION >= 0x1000e // 1.0.14 if (devices.size() > 0) dev = QLatin1String(devices.first()); else @@ -315,7 +315,7 @@ bool QAlsaAudioOutput::open() dev = QLatin1String("hw:0,0"); #endif } else { -#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) +#if SND_LIB_VERSION >= 0x1000e // 1.0.14 dev = QLatin1String(m_device); #else int idx = 0; -- cgit v1.2.3