From 272624fe83a6867e920ff1cde316fd02bab1a23c Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Fri, 18 Sep 2020 14:59:30 -0400 Subject: [PATCH] alsa-monitor: Don't ignore device reservation failure We were ignoring the reservation status, which is incorrect as we might not have succeeded in grabbing the device. --- src/examples/media-session/alsa-monitor.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/examples/media-session/alsa-monitor.c b/src/examples/media-session/alsa-monitor.c index a5a3a6441..18927c747 100644 --- a/src/examples/media-session/alsa-monitor.c +++ b/src/examples/media-session/alsa-monitor.c @@ -159,8 +159,9 @@ static int node_acquire(void *data) node->acquired = true; if (device && device->n_acquired++ == 0 && device->reserve) - rd_device_acquire(device->reserve); - return 0; + return rd_device_acquire(device->reserve); + else + return 0; } static int node_release(void *data) @@ -775,10 +776,6 @@ static struct device *alsa_create_device(struct impl *impl, uint32_t id, goto clean_device; } - sm_object_add_listener(&device->sdevice->obj, - &device->listener, - &device_events, device); - if (impl->conn && (card = spa_dict_lookup(info->props, SPA_KEY_API_ALSA_CARD)) != NULL) { const char *reserve; @@ -796,10 +793,18 @@ static struct device *alsa_create_device(struct impl *impl, uint32_t id, rd_device_set_application_device_name(device->reserve, spa_dict_lookup(info->props, SPA_KEY_API_ALSA_PATH)); - rd_device_acquire(device->reserve); + if (rd_device_acquire(device->reserve) < 0) { + pw_log_warn("could not reserve device for %s: %m", reserve); + goto clean_device; + } } device->priority -= atol(card) * 64; } + + sm_object_add_listener(&device->sdevice->obj, + &device->listener, + &device_events, device); + device->pending_profile = 1; device->first = true; spa_list_init(&device->node_list);