From 0ff2a6b434dec1a694f4cde64469ca19d97d9897 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 10 Oct 2009 14:19:39 +0100 Subject: device-manager: Rather than flagging the device as available, just include the sink/source index with PA_INVALID_INDEX meaning unavailable --- src/modules/module-device-manager.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/modules/module-device-manager.c') diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c index bfcbfeaf..e3158644 100644 --- a/src/modules/module-device-manager.c +++ b/src/modules/module-device-manager.c @@ -1033,13 +1033,13 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio if ((e = read_entry(u, name))) { uint32_t idx; char *devname; - pa_bool_t available = FALSE; + uint32_t index = PA_INVALID_INDEX; if ((devname = get_name(name, "sink:"))) { pa_sink* s; PA_IDXSET_FOREACH(s, u->core->sinks, idx) { if (strcmp(s->name, devname) == 0) { - available = TRUE; + index = s->index; break; } } @@ -1048,7 +1048,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio pa_source* s; PA_IDXSET_FOREACH(s, u->core->sources, idx) { if (strcmp(s->name, devname) == 0) { - available = TRUE; + index = s->index; break; } } @@ -1058,7 +1058,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio pa_tagstruct_puts(reply, name); pa_tagstruct_puts(reply, e->description); pa_tagstruct_puts(reply, e->icon); - pa_tagstruct_put_boolean(reply, available); + pa_tagstruct_putu32(reply, index); pa_tagstruct_putu32(reply, NUM_ROLES); for (uint32_t i = ROLE_NONE; i < NUM_ROLES; ++i) { -- cgit