diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 14:26:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 14:26:22 +0100 |
| commit | e757890f4a5669b396039211902224f31666725a (patch) | |
| tree | bb220ff8b9d8d4a64ce5f197a4b39e3e5965da63 /src/plugins/alsa/qalsaaudiodeviceinfo.cpp | |
| parent | caf0cbca71231dbb6403108ba41d2117d3ce6c6d (diff) | |
| parent | 71a6b1b62041981f894cb2b6589fce92f137bbc4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ieb1a3081907093e31e8c8b7f95993bb3b2173672
Diffstat (limited to 'src/plugins/alsa/qalsaaudiodeviceinfo.cpp')
| -rw-r--r-- | src/plugins/alsa/qalsaaudiodeviceinfo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/alsa/qalsaaudiodeviceinfo.cpp b/src/plugins/alsa/qalsaaudiodeviceinfo.cpp index 5e7aaa3d0..0342ca546 100644 --- a/src/plugins/alsa/qalsaaudiodeviceinfo.cpp +++ b/src/plugins/alsa/qalsaaudiodeviceinfo.cpp @@ -147,7 +147,7 @@ bool QAlsaAudioDeviceInfo::open() QList<QByteArray> devices = availableDevices(mode); 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().constData()); else @@ -156,7 +156,7 @@ bool QAlsaAudioDeviceInfo::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 = device; #else int idx = 0; @@ -200,7 +200,7 @@ bool QAlsaAudioDeviceInfo::testSettings(const QAudioFormat& format) const snd_pcm_hw_params_t *params; QString dev; -#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) +#if SND_LIB_VERSION >= 0x1000e // 1.0.14 dev = device; if (dev.compare(QLatin1String("default")) == 0) { QList<QByteArray> devices = availableDevices(QAudio::AudioOutput); @@ -341,7 +341,7 @@ QList<QByteArray> QAlsaAudioDeviceInfo::availableDevices(QAudio::Mode mode) QList<QByteArray> devices; QByteArray filter; -#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) +#if SND_LIB_VERSION >= 0x1000e // 1.0.14 // Create a list of all current audio devices that support mode void **hints, **n; char *name, *descr, *io; |