diff options
author | David Henningsson <david.henningsson@canonical.com> | 2013-07-19 16:38:16 +0200 |
---|---|---|
committer | David Henningsson <david.henningsson@canonical.com> | 2013-07-26 14:30:08 +0200 |
commit | 908deb136c46c17e5c42fd3a2767746c767d10eb (patch) | |
tree | e901ba65ea2605c69f7ad21a26a8c2d2d2db520d | |
parent | ce21dc4348c787535d7990515d7ccacd4a58e029 (diff) | |
download | pulseaudio-908deb136c46c17e5c42fd3a2767746c767d10eb.tar.gz |
alsa-ucm: Make combination ports have lower priority
Usually, you want to use one input or output at a time: e g,
you expect your speaker to mute when you plug in headphones.
Therefore, the headphones+speaker port should have lower priority
and both headphones and speaker.
A practical formula to do this is 1/x = 1/xa + 1/xb + .. + 1/xn.
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-rw-r--r-- | src/modules/alsa/alsa-ucm.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c index 9205cdf77..0fa269533 100644 --- a/src/modules/alsa/alsa-ucm.c +++ b/src/modules/alsa/alsa-ucm.c @@ -655,6 +655,7 @@ static void ucm_add_port_combination( pa_device_port *port; int i; unsigned priority; + double prio2; char *name, *desc; const char *dev_name; const char *direction; @@ -668,6 +669,7 @@ static void ucm_add_port_combination( : pa_sprintf_malloc("Combination port for %s", dev_name); priority = is_sink ? dev->playback_priority : dev->capture_priority; + prio2 = (priority == 0 ? 0 : 1.0/priority); for (i = 1; i < num; i++) { char *tmp; @@ -683,10 +685,19 @@ static void ucm_add_port_combination( pa_xfree(desc); desc = tmp; - /* FIXME: Is this true? */ - priority += (is_sink ? dev->playback_priority : dev->capture_priority); + priority = is_sink ? dev->playback_priority : dev->capture_priority; + if (priority != 0 && prio2 > 0) + prio2 += 1.0/priority; } + /* Make combination ports always have lower priority, and use the formula + 1/p = 1/p1 + 1/p2 + ... 1/pn. + This way, the result will always be less than the individual components, + yet higher components will lead to higher result. */ + + if (num > 1) + priority = prio2 > 0 ? 1.0/prio2 : 0; + port = pa_hashmap_get(ports, name); if (!port) { pa_device_port_new_data port_data; |