mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa/alsa-udev: Check accessibility of pcm devices as well

Browse source 
The order of attribute changes is random, so it's possible that controlCX is
accessible before the other devices, which marks the device as available but it
actually fails to open. Only consider the device accessible if both control and
PCM devices can be accessed.

This requires reacting to ATTRIB changes of pcm devices as well now.

Fixes #2534
This commit is contained in:
Fabian Vogt 2022-07-13 10:47:22 +02:00 • committed by Wim Taymans
parent 35082e4f4b
commit ed88cad583
1 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

34
spa/plugins/alsa/alsa-udev.c
View file

@ -538,11 +538,35 @@ static int emit_object_info(struct impl *this, struct device *device)
static bool check_access(struct impl *this, struct device *device)
{
char path[128];
bool accessible;
char path[128], prefix[32];
DIR *snd = NULL;
struct dirent *entry;
bool accessible = false;
snprintf(path, sizeof(path), "/dev/snd/controlC%u", device->id);
accessible = access(path, R_OK|W_OK) >= 0;
if (access(path, R_OK|W_OK) >= 0 && (snd = opendir("/dev/snd"))) {
/*
* It's possible that controlCX is accessible before pcmCX* or
* the other way around. Return true only if all devices are
* accessible.
*/
accessible = true;
spa_scnprintf(prefix, sizeof(prefix), "pcmC%uD", device->id);
while ((entry = readdir(snd)) != NULL) {
if (!(entry->d_type == DT_CHR &&
spa_strstartswith(entry->d_name, prefix)))
continue;
snprintf(path, sizeof(path), "/dev/snd/%.32s", entry->d_name);
if (access(path, R_OK|W_OK) < 0) {
accessible = false;
break;
}
}
closedir(snd);
}
if (accessible != device->accessible)
spa_log_debug(this->log, "%s accessible:%u", path, accessible);
device->accessible = accessible;
@ -655,10 +679,6 @@ static void impl_on_notify_events(struct spa_source *source)
/* Device becomes accessible or not busy */
if ((event->mask & (IN_ATTRIB | IN_CLOSE_WRITE))) {
bool access;
if ((event->mask & IN_ATTRIB) &&
spa_strstartswith(event->name, "pcm"))
continue;
if (sscanf(event->name, "controlC%u", &id) != 1 &&
sscanf(event->name, "pcmC%uD", &id) != 1)
continue;