Line 0
Link Here
|
|
|
1 |
--- src/plugins/alsa/qalsaaudiodeviceinfo.cpp.orig 2015-11-27 18:32:25 UTC |
2 |
+++ src/plugins/alsa/qalsaaudiodeviceinfo.cpp |
3 |
@@ -141,7 +141,7 @@ bool QAlsaAudioDeviceInfo::open() |
4 |
QList<QByteArray> devices = availableDevices(mode); |
5 |
|
6 |
if(dev.compare(QLatin1String("default")) == 0) { |
7 |
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) |
8 |
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) |
9 |
if (devices.size() > 0) |
10 |
dev = QLatin1String(devices.first().constData()); |
11 |
else |
12 |
@@ -150,7 +150,7 @@ bool QAlsaAudioDeviceInfo::open() |
13 |
dev = QLatin1String("hw:0,0"); |
14 |
#endif |
15 |
} else { |
16 |
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) |
17 |
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) |
18 |
dev = device; |
19 |
#else |
20 |
int idx = 0; |
21 |
@@ -194,7 +194,7 @@ bool QAlsaAudioDeviceInfo::testSettings( |
22 |
snd_pcm_hw_params_t *params; |
23 |
QString dev; |
24 |
|
25 |
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) |
26 |
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) |
27 |
dev = device; |
28 |
if (dev.compare(QLatin1String("default")) == 0) { |
29 |
QList<QByteArray> devices = availableDevices(QAudio::AudioOutput); |
30 |
@@ -335,7 +335,7 @@ QList<QByteArray> QAlsaAudioDeviceInfo:: |
31 |
QList<QByteArray> devices; |
32 |
QByteArray filter; |
33 |
|
34 |
-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) |
35 |
+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) |
36 |
// Create a list of all current audio devices that support mode |
37 |
void **hints; |
38 |
char *name, *descr, *io; |