sink: Invert priorities to prefer external devices

Currently internal > speaker > headphone and pci > usb > bluetooth.
Invert both of these sets, with the reasoning that a headphone and
speakers are something that a user has actively attached and should
therefore get a higher priority. The same reasoning is applied for
the bus type, i.e. bluetooth and usb should be higher than pci,
because they most likely have been actively attached be a user.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=99222
This commit is contained in:
Christian Kellner 2017-03-09 15:51:49 +01:00 committed by Tanu Kaskinen
parent a3acc167aa
commit b53dd1f0df

View file

@ -3511,21 +3511,21 @@ unsigned pa_device_init_priority(pa_proplist *p) {
if ((s = pa_proplist_gets(p, PA_PROP_DEVICE_FORM_FACTOR))) { if ((s = pa_proplist_gets(p, PA_PROP_DEVICE_FORM_FACTOR))) {
if (pa_streq(s, "internal")) if (pa_streq(s, "headphone"))
priority += 900; priority += 900;
else if (pa_streq(s, "speaker")) else if (pa_streq(s, "speaker"))
priority += 500; priority += 500;
else if (pa_streq(s, "headphone")) else if (pa_streq(s, "internal"))
priority += 400; priority += 400;
} }
if ((s = pa_proplist_gets(p, PA_PROP_DEVICE_BUS))) { if ((s = pa_proplist_gets(p, PA_PROP_DEVICE_BUS))) {
if (pa_streq(s, "pci")) if (pa_streq(s, "bluetooth"))
priority += 50; priority += 50;
else if (pa_streq(s, "usb")) else if (pa_streq(s, "usb"))
priority += 40; priority += 40;
else if (pa_streq(s, "bluetooth")) else if (pa_streq(s, "pci"))
priority += 30; priority += 30;
} }