mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-switch-on-port-available: Use new find best port function

Browse source 
Now that we have a generic function in device-port.h, we can use
it instead of the custom one.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2014-03-28 11:09:14 +01:00
parent 06ad1b7a06
commit 319a665ce8
1 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/modules/module-switch-on-port-available.c
View file

@ -36,21 +36,6 @@ struct userdata {
pa_hook_slot *source_new_slot; pa_hook_slot *source_new_slot;
}; };
static pa_device_port* find_best_port(pa_hashmap *ports) {
void *state;
pa_device_port* port, *result = NULL;
PA_HASHMAP_FOREACH(port, ports, state) {
if (result == NULL ||
result->available == PA_AVAILABLE_NO ||
(port->available != PA_AVAILABLE_NO && port->priority > result->priority)) {
result = port;
}
}
return result;
}
static bool profile_good_for_output(pa_card_profile *profile) { static bool profile_good_for_output(pa_card_profile *profile) {
pa_sink *sink; pa_sink *sink;
uint32_t idx; uint32_t idx;
@ -203,7 +188,7 @@ static pa_hook_result_t port_available_hook_callback(pa_core *c, pa_device_port
if (port->available == PA_AVAILABLE_NO) { if (port->available == PA_AVAILABLE_NO) {
if (sink) { if (sink) {
pa_device_port *p2 = find_best_port(sink->ports); pa_device_port *p2 = pa_device_port_find_best(sink->ports);
if (p2 && p2->available != PA_AVAILABLE_NO) if (p2 && p2->available != PA_AVAILABLE_NO)
pa_sink_set_port(sink, p2->name, false); pa_sink_set_port(sink, p2->name, false);
@ -213,7 +198,7 @@ static pa_hook_result_t port_available_hook_callback(pa_core *c, pa_device_port
} }
if (source) { if (source) {
pa_device_port *p2 = find_best_port(source->ports); pa_device_port *p2 = pa_device_port_find_best(source->ports);
if (p2 && p2->available != PA_AVAILABLE_NO) if (p2 && p2->available != PA_AVAILABLE_NO)
pa_source_set_port(source, p2->name, false); pa_source_set_port(source, p2->name, false);
@ -259,7 +244,7 @@ static pa_device_port *new_sink_source(pa_hashmap *ports, const char *name) {
if (p->available != PA_AVAILABLE_NO) if (p->available != PA_AVAILABLE_NO)
return NULL; return NULL;
pa_assert_se(p = find_best_port(ports)); pa_assert_se(p = pa_device_port_find_best(ports));
return p; return p;
} }