slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Alsa: fix crash when detecting devices."

Browse Source 
This reverts commit 0ab81ef59f.
The workaround causes software devices not to appear in the list
of available devices. Besides, since the crash is caused by a bug
in older versions of Alsa, the workaround was probably a bad idea
in the first place. People should update Alsa instead.

Task-number: QTBUG-42326
Change-Id: I37923a87180d1c5abc18d52d84f633e14ba46860
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
This commit is contained in:
Yoann Lopes
2015-03-11 14:32:17 +01:00
parent 95e9155b7f
commit e1d76e2df5
2 changed files with 72 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/gsttools/qgstreameraudioinputselector.cpp
View File

@@ -111,36 +111,33 @@ void QGstreamerAudioInputSelector::updateAlsaDevices()
{ {
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
void **hints, **n; void **hints, **n;
int card = -1; if (snd_device_name_hint(-1, "pcm", &hints) < 0) {
qWarning()<<"no alsa devices available";
return;
}
n = hints;
while (snd_card_next(&card) == 0 && card >= 0) { while (*n != NULL) {
if (snd_device_name_hint(card, "pcm", &hints) < 0) char *name = snd_device_name_get_hint(*n, "NAME");
continue; char *descr = snd_device_name_get_hint(*n, "DESC");
char *io = snd_device_name_get_hint(*n, "IOID");
n = hints; if ((name != NULL) && (descr != NULL)) {
while (*n != NULL) { if ( io == NULL || qstrcmp(io,"Input") == 0 ) {
char *name = snd_device_name_get_hint(*n, "NAME"); m_names.append(QLatin1String("alsa:")+QString::fromUtf8(name));
char *descr = snd_device_name_get_hint(*n, "DESC"); m_descriptions.append(QString::fromUtf8(descr));
char *io = snd_device_name_get_hint(*n, "IOID");
if ((name != NULL) && (descr != NULL)) {
if ( io == NULL || qstrcmp(io,"Input") == 0 ) {
m_names.append(QLatin1String("alsa:")+QString::fromUtf8(name));
m_descriptions.append(QString::fromUtf8(descr));
}
} }
if (name != NULL)
free(name);
if (descr != NULL)
free(descr);
if (io != NULL)
free(io);
++n;
} }
snd_device_name_free_hint(hints); if (name != NULL)
free(name);
if (descr != NULL)
free(descr);
if (io != NULL)
free(io);
n++;
} }
snd_device_name_free_hint(hints);
#endif #endif
} }

107
src/plugins/alsa/qalsaaudiodeviceinfo.cpp
View File

@@ -337,9 +337,14 @@ QList<QByteArray> QAlsaAudioDeviceInfo::availableDevices(QAudio::Mode mode)
#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) #if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
// Create a list of all current audio devices that support mode // Create a list of all current audio devices that support mode
void **hints; void **hints, **n;
char *name, *descr, *io; char *name, *descr, *io;
int card = -1;
if(snd_device_name_hint(-1, "pcm", &hints) < 0) {
qWarning() << "no alsa devices available";
return devices;
}
n = hints;
if(mode == QAudio::AudioInput) { if(mode == QAudio::AudioInput) {
filter = "Input"; filter = "Input";
@@ -347,35 +352,28 @@ QList<QByteArray> QAlsaAudioDeviceInfo::availableDevices(QAudio::Mode mode)
filter = "Output"; filter = "Output";
} }
while (snd_card_next(&card) == 0 && card >= 0) { while (*n != NULL) {
if (snd_device_name_hint(card, "pcm", &hints) < 0) name = snd_device_name_get_hint(*n, "NAME");
continue; if (name != 0 && qstrcmp(name, "null") != 0) {
descr = snd_device_name_get_hint(*n, "DESC");
io = snd_device_name_get_hint(*n, "IOID");
void **n = hints; if ((descr != NULL) && ((io == NULL) || (io == filter))) {
while (*n != NULL) { QString deviceName = QLatin1String(name);
name = snd_device_name_get_hint(*n, "NAME"); QString deviceDescription = QLatin1String(descr);
if (name != 0 && qstrcmp(name, "null") != 0) { if (deviceDescription.contains(QLatin1String("Default Audio Device")))
descr = snd_device_name_get_hint(*n, "DESC"); devices.prepend(deviceName.toLocal8Bit().constData());
io = snd_device_name_get_hint(*n, "IOID"); else
devices.append(deviceName.toLocal8Bit().constData());
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());
}
free(descr);
free(io);
} }
free(name);
++n;
}
snd_device_name_free_hint(hints); free(descr);
free(io);
}
free(name);
++n;
} }
snd_device_name_free_hint(hints);
#else #else
int idx = 0; int idx = 0;
char* name; char* name;
@@ -416,41 +414,38 @@ void QAlsaAudioDeviceInfo::checkSurround()
surround51 = false; surround51 = false;
surround71 = false; surround71 = false;
void **hints; void **hints, **n;
char *name, *descr, *io; char *name, *descr, *io;
int card = -1;
while (snd_card_next(&card) == 0 && card >= 0) { if(snd_device_name_hint(-1, "pcm", &hints) < 0)
if (snd_device_name_hint(card, "pcm", &hints) < 0) return;
continue;
void **n = hints; n = hints;
while (*n != NULL) {
name = snd_device_name_get_hint(*n, "NAME"); while (*n != NULL) {
descr = snd_device_name_get_hint(*n, "DESC"); name = snd_device_name_get_hint(*n, "NAME");
io = snd_device_name_get_hint(*n, "IOID"); descr = snd_device_name_get_hint(*n, "DESC");
if((name != NULL) && (descr != NULL)) { io = snd_device_name_get_hint(*n, "IOID");
QString deviceName = QLatin1String(name); if((name != NULL) && (descr != NULL)) {
if (mode == QAudio::AudioOutput) { QString deviceName = QLatin1String(name);
if(deviceName.contains(QLatin1String("surround40"))) if (mode == QAudio::AudioOutput) {
surround40 = true; if(deviceName.contains(QLatin1String("surround40")))
if(deviceName.contains(QLatin1String("surround51"))) surround40 = true;
surround51 = true; if(deviceName.contains(QLatin1String("surround51")))
if(deviceName.contains(QLatin1String("surround71"))) surround51 = true;
surround71 = true; if(deviceName.contains(QLatin1String("surround71")))
} surround71 = true;
} }
if(name != NULL)
free(name);
if(descr != NULL)
free(descr);
if(io != NULL)
free(io);
++n;
} }
if(name != NULL)
snd_device_name_free_hint(hints); free(name);
if(descr != NULL)
free(descr);
if(io != NULL)
free(io);
++n;
} }
snd_device_name_free_hint(hints);
} }
QT_END_NAMESPACE QT_END_NAMESPACE