diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index 81fefbc07..95cf9b677 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -304,9 +304,18 @@ pa_sink* pa_sink_new( void *state; pa_device_port *p; - PA_HASHMAP_FOREACH(p, s->ports, state) + PA_HASHMAP_FOREACH(p, s->ports, state) { + if (p->available == PA_AVAILABLE_NO) + continue; + if (!s->active_port || p->priority > s->active_port->priority) s->active_port = p; + } + if (!s->active_port) { + PA_HASHMAP_FOREACH(p, s->ports, state) + if (!s->active_port || p->priority > s->active_port->priority) + s->active_port = p; + } } if (s->active_port) diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c index 92411de89..a6dc9bfe9 100644 --- a/src/pulsecore/source.c +++ b/src/pulsecore/source.c @@ -292,9 +292,19 @@ pa_source* pa_source_new( void *state; pa_device_port *p; - PA_HASHMAP_FOREACH(p, s->ports, state) + PA_HASHMAP_FOREACH(p, s->ports, state) { + if (p->available == PA_AVAILABLE_NO) + continue; + if (!s->active_port || p->priority > s->active_port->priority) s->active_port = p; + } + + if (!s->active_port) { + PA_HASHMAP_FOREACH(p, s->ports, state) + if (!s->active_port || p->priority > s->active_port->priority) + s->active_port = p; + } } if (s->active_port)