switch-on-port-available: unify input/output switching policy

I don't think there's any reason why the same logic that has
previously added to output profile switching shouldn't be used with
input too.
This commit is contained in:
Tanu Kaskinen 2016-03-04 15:23:27 +02:00 committed by Arun Raghavan
parent 4f7ade31a9
commit fe4f96d56e

View file

@ -56,7 +56,10 @@ static bool profile_good_for_output(pa_card_profile *profile, unsigned prio) {
return true; return true;
} }
static bool profile_good_for_input(pa_card_profile *profile) { static bool profile_good_for_input(pa_card_profile *profile, unsigned prio) {
pa_source *source;
uint32_t idx;
pa_assert(profile); pa_assert(profile);
if (!pa_safe_streq(profile->card->active_profile->output_name, profile->output_name)) if (!pa_safe_streq(profile->card->active_profile->output_name, profile->output_name))
@ -68,6 +71,14 @@ static bool profile_good_for_input(pa_card_profile *profile) {
if (profile->card->active_profile->max_sink_channels != profile->max_sink_channels) if (profile->card->active_profile->max_sink_channels != profile->max_sink_channels)
return false; return false;
PA_IDXSET_FOREACH(source, profile->card->sources, idx) {
if (!source->active_port)
continue;
if ((source->active_port->available != PA_AVAILABLE_NO) && (source->active_port->priority >= prio))
return false;
}
return true; return true;
} }
@ -93,7 +104,7 @@ static int try_to_switch_profile(pa_device_port *port) {
case PA_DIRECTION_INPUT: case PA_DIRECTION_INPUT:
name = profile->input_name; name = profile->input_name;
good = profile_good_for_input(profile); good = profile_good_for_input(profile, port->priority);
break; break;
} }