From 06ad1b7a06f48c012a63880b985954af25b87034 Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Fri, 28 Mar 2014 11:55:24 +0100 Subject: [PATCH] module-switch-on-port-available: Use port->card pointer We now have a port->card pointer, we can use it instead of iterating over cards to find the correct one. Signed-off-by: David Henningsson --- src/modules/module-switch-on-port-available.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/modules/module-switch-on-port-available.c b/src/modules/module-switch-on-port-available.c index c560306b..d8cb82b6 100644 --- a/src/modules/module-switch-on-port-available.c +++ b/src/modules/module-switch-on-port-available.c @@ -153,7 +153,6 @@ static void find_sink_and_source(pa_card *card, pa_device_port *port, pa_sink ** } static pa_hook_result_t port_available_hook_callback(pa_core *c, pa_device_port *port, void* userdata) { - uint32_t state; pa_card* card; pa_sink *sink; pa_source *source; @@ -162,14 +161,10 @@ static pa_hook_result_t port_available_hook_callback(pa_core *c, pa_device_port if (port->available == PA_AVAILABLE_UNKNOWN) return PA_HOOK_OK; - pa_log_debug("finding port %s", port->name); - - PA_IDXSET_FOREACH(card, c->cards, state) - if (port == pa_hashmap_get(card->ports, port->name)) - break; + card = port->card; if (!card) { - pa_log_warn("Did not find port %s in array of cards", port->name); + pa_log_warn("Port %s does not have a card", port->name); return PA_HOOK_OK; } -- 2.39.2