From fb9604741c40790cef72d06afe6ca53165f57b16 Mon Sep 17 00:00:00 2001
From: Justin McPherson <justin.mcpherson@nokia.com>
Date: Wed, 24 Nov 2010 10:45:53 +1000
Subject: Fix compliation of ALSA audio backend when checking for surround
 support.

Surround support requires ALSA lib >= 1.0.14

Task-number: QTBUG-15205
Reviewed-by: Andrew den Exter
---
 src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp | 6 ++++++
 src/multimedia/audio/qaudiodeviceinfo_alsa_p.h   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
index 25622a49e3..3617d24333 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
@@ -63,7 +63,9 @@ QAudioDeviceInfoInternal::QAudioDeviceInfoInternal(QByteArray dev, QAudio::Mode
     device = QLatin1String(dev);
     this->mode = mode;
 
+#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
     checkSurround();
+#endif
 }
 
 QAudioDeviceInfoInternal::~QAudioDeviceInfoInternal()
@@ -394,9 +396,11 @@ void QAudioDeviceInfoInternal::updateLists()
     }
     channelz.append(1);
     channelz.append(2);
+#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
     if (surround40) channelz.append(4);
     if (surround51) channelz.append(6);
     if (surround71) channelz.append(8);
+#endif
     sizez.append(8);
     sizez.append(16);
     sizez.append(32);
@@ -494,6 +498,7 @@ QByteArray QAudioDeviceInfoInternal::defaultOutputDevice()
     return devices.first();
 }
 
+#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
 void QAudioDeviceInfoInternal::checkSurround()
 {
     QList<QByteArray> devices;
@@ -534,5 +539,6 @@ void QAudioDeviceInfoInternal::checkSurround()
     }
     snd_device_name_free_hint(hints);
 }
+#endif
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
index 8525980e05..5f7e5e8317 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
@@ -98,10 +98,12 @@ private:
     bool open();
     void close();
 
+#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
     void checkSurround();
     bool surround40;
     bool surround51;
     bool surround71;
+#endif
 
     QString device;
     QAudio::Mode mode;
-- 
cgit v1.2.1