From 5473621bde2be226f2f3687a80b4bfc93bbbe572 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Tue, 3 May 2016 16:01:45 +0200 Subject: [PATCH] ALSA: improve handling of default device. - "default" is a valid argument for snd_pcm_open(), let ALSA handle that case rather than using the first device in the list. - Don't add "default" in the list of available devices if there is already one. Change-Id: Icd41aa6677923a79faf6c90d0627eedd8700b91b Reviewed-by: Christian Stromme --- src/plugins/alsa/qalsaaudiodeviceinfo.cpp | 96 +++++++++-------------- src/plugins/alsa/qalsaaudiodeviceinfo.h | 1 + src/plugins/alsa/qalsaaudioinput.cpp | 34 ++------ src/plugins/alsa/qalsaaudiooutput.cpp | 34 ++------ 4 files changed, 56 insertions(+), 109 deletions(-) diff --git a/src/plugins/alsa/qalsaaudiodeviceinfo.cpp b/src/plugins/alsa/qalsaaudiodeviceinfo.cpp index 31ad47ce..c7650d17 100644 --- a/src/plugins/alsa/qalsaaudiodeviceinfo.cpp +++ b/src/plugins/alsa/qalsaaudiodeviceinfo.cpp @@ -137,35 +137,18 @@ QList QAlsaAudioDeviceInfo::supportedSampleTypes() bool QAlsaAudioDeviceInfo::open() { int err = 0; - QString dev = device; - QList devices = availableDevices(mode); + QString dev; - if(dev.compare(QLatin1String("default")) == 0) { -#if SND_LIB_VERSION >= 0x1000e // 1.0.14 - if (devices.size() > 0) - dev = QLatin1String(devices.first().constData()); - else - return false; -#else - dev = QLatin1String("hw:0,0"); + if (!availableDevices(mode).contains(device.toLocal8Bit())) + return false; + +#if SND_LIB_VERSION < 0x1000e // 1.0.14 + if (device.compare(QLatin1String("default")) != 0) + dev = deviceFromCardName(device); + else #endif - } else { -#if SND_LIB_VERSION >= 0x1000e // 1.0.14 dev = device; -#else - int idx = 0; - char *name; - QString shortName = device.mid(device.indexOf(QLatin1String("="),0)+1); - - while (snd_card_get_name(idx,&name) == 0) { - if(dev.contains(QLatin1String(name))) - break; - idx++; - } - dev = QString(QLatin1String("hw:%1,0")).arg(idx); -#endif - } if(mode == QAudio::AudioOutput) { err=snd_pcm_open( &handle,dev.toLocal8Bit().constData(),SND_PCM_STREAM_PLAYBACK,0); } else { @@ -194,30 +177,12 @@ bool QAlsaAudioDeviceInfo::testSettings(const QAudioFormat& format) const snd_pcm_hw_params_t *params; QString dev; -#if SND_LIB_VERSION >= 0x1000e // 1.0.14 - dev = device; - if (dev.compare(QLatin1String("default")) == 0) { - QList devices = availableDevices(QAudio::AudioOutput); - if (!devices.isEmpty()) - dev = QLatin1String(devices.first().constData()); - } -#else - if (dev.compare(QLatin1String("default")) == 0) { - dev = QLatin1String("hw:0,0"); - } else { - int idx = 0; - char *name; - - QString shortName = device.mid(device.indexOf(QLatin1String("="),0)+1); - - while(snd_card_get_name(idx,&name) == 0) { - if(shortName.compare(QLatin1String(name)) == 0) - break; - idx++; - } - dev = QString(QLatin1String("hw:%1,0")).arg(idx); - } +#if SND_LIB_VERSION < 0x1000e // 1.0.14 + if (device.compare(QLatin1String("default")) != 0) + dev = deviceFromCardName(device); + else #endif + dev = device; snd_pcm_stream_t stream = mode == QAudio::AudioOutput ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; @@ -333,9 +298,11 @@ void QAlsaAudioDeviceInfo::updateLists() QList QAlsaAudioDeviceInfo::availableDevices(QAudio::Mode mode) { QList devices; - QByteArray filter; + bool hasDefault = false; #if SND_LIB_VERSION >= 0x1000e // 1.0.14 + QByteArray filter; + // Create a list of all current audio devices that support mode void **hints, **n; char *name, *descr, *io; @@ -359,12 +326,9 @@ QList QAlsaAudioDeviceInfo::availableDevices(QAudio::Mode mode) io = snd_device_name_get_hint(*n, "IOID"); if ((descr != NULL) && ((io == NULL) || (io == filter))) { - QString deviceName = QLatin1String(name); - QString deviceDescription = QLatin1String(descr); - if (deviceDescription.contains(QLatin1String("Default Audio Device"))) - devices.prepend(deviceName.toLocal8Bit().constData()); - else - devices.append(deviceName.toLocal8Bit().constData()); + devices.append(name); + if (strcmp(name, "default") == 0) + hasDefault = true; } free(descr); @@ -380,12 +344,14 @@ QList QAlsaAudioDeviceInfo::availableDevices(QAudio::Mode mode) while(snd_card_get_name(idx,&name) == 0) { devices.append(name); + if (strcmp(name, "default") == 0) + hasDefault = true; idx++; } #endif - if (devices.size() > 0) - devices.append("default"); + if (!hasDefault && devices.size() > 0) + devices.prepend("default"); return devices; } @@ -448,4 +414,20 @@ void QAlsaAudioDeviceInfo::checkSurround() snd_device_name_free_hint(hints); } +QString QAlsaAudioDeviceInfo::deviceFromCardName(const QString &card) +{ + int idx = 0; + char *name; + + QStringRef shortName = card.midRef(card.indexOf(QLatin1String("="), 0) + 1); + + while (snd_card_get_name(idx, &name) == 0) { + if (shortName.compare(QLatin1String(name)) == 0) + break; + idx++; + } + + return QString(QLatin1String("hw:%1,0")).arg(idx); +} + QT_END_NAMESPACE diff --git a/src/plugins/alsa/qalsaaudiodeviceinfo.h b/src/plugins/alsa/qalsaaudiodeviceinfo.h index 138eacf2..00cb9df5 100644 --- a/src/plugins/alsa/qalsaaudiodeviceinfo.h +++ b/src/plugins/alsa/qalsaaudiodeviceinfo.h @@ -85,6 +85,7 @@ public: static QByteArray defaultInputDevice(); static QByteArray defaultOutputDevice(); static QList availableDevices(QAudio::Mode); + static QString deviceFromCardName(const QString &card); private: bool open(); diff --git a/src/plugins/alsa/qalsaaudioinput.cpp b/src/plugins/alsa/qalsaaudioinput.cpp index 5f7a788a..2d636d1e 100644 --- a/src/plugins/alsa/qalsaaudioinput.cpp +++ b/src/plugins/alsa/qalsaaudioinput.cpp @@ -300,34 +300,16 @@ bool QAlsaAudioInput::open() } - QString dev = QString(QLatin1String(m_device.constData())); - QList devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioInput); - if(dev.compare(QLatin1String("default")) == 0) { -#if SND_LIB_VERSION >= 0x1000e // 1.0.14 - if (devices.size() > 0) - dev = QLatin1String(devices.first()); - else - return false; -#else - dev = QLatin1String("hw:0,0"); -#endif - } else { -#if SND_LIB_VERSION >= 0x1000e // 1.0.14 - dev = QLatin1String(m_device); -#else - int idx = 0; - char *name; + if (!QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioOutput).contains(m_device)) + return false; - QString shortName = QLatin1String(m_device.mid(m_device.indexOf('=',0)+1).constData()); - - while(snd_card_get_name(idx,&name) == 0) { - if(qstrncmp(shortName.toLocal8Bit().constData(),name,shortName.length()) == 0) - break; - idx++; - } - dev = QString(QLatin1String("hw:%1,0")).arg(idx); + QString dev; +#if SND_LIB_VERSION < 0x1000e // 1.0.14 + if (m_device != "default") + dev = QAlsaAudioDeviceInfo::deviceFromCardName(m_device); + else #endif - } + dev = m_device; // Step 1: try and open the device while((count < 5) && (err < 0)) { diff --git a/src/plugins/alsa/qalsaaudiooutput.cpp b/src/plugins/alsa/qalsaaudiooutput.cpp index 02681a4d..bf607e05 100644 --- a/src/plugins/alsa/qalsaaudiooutput.cpp +++ b/src/plugins/alsa/qalsaaudiooutput.cpp @@ -303,34 +303,16 @@ bool QAlsaAudioOutput::open() return false; } - QString dev = QString(QLatin1String(m_device.constData())); - QList devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioOutput); - if(dev.compare(QLatin1String("default")) == 0) { -#if SND_LIB_VERSION >= 0x1000e // 1.0.14 - if (devices.size() > 0) - dev = QLatin1String(devices.first()); - else - return false; -#else - dev = QLatin1String("hw:0,0"); -#endif - } else { -#if SND_LIB_VERSION >= 0x1000e // 1.0.14 - dev = QLatin1String(m_device); -#else - int idx = 0; - char *name; + if (!QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioOutput).contains(m_device)) + return false; - QString shortName = QLatin1String(m_device.mid(m_device.indexOf('=',0)+1).constData()); - - while (snd_card_get_name(idx,&name) == 0) { - if(qstrncmp(shortName.toLocal8Bit().constData(),name,shortName.length()) == 0) - break; - idx++; - } - dev = QString(QLatin1String("hw:%1,0")).arg(idx); + QString dev; +#if SND_LIB_VERSION < 0x1000e // 1.0.14 + if (m_device != "default") + dev = QAlsaAudioDeviceInfo::deviceFromCardName(m_device); + else #endif - } + dev = m_device; // Step 1: try and open the device while((count < 5) && (err < 0)) {