alsa: Use card description in default sink/source prefix when available

When given an explicit device.description in card_properties, prefer
this information over other default prefixes (e.g. 'Built-in Audio')
when constructing sink/source descriptions.

For example, if I manually configure the card description to be
"FooBar", I then expect that the sinks and created by the card also
have "FooBar" in their description instead of generic "Built-in
Audio".
This commit is contained in:
Pete Beardmore 2014-03-13 10:14:40 +00:00 committed by Tanu Kaskinen
parent efec98280f
commit fe6e41d7d2
9 changed files with 19 additions and 14 deletions

View file

@ -868,11 +868,11 @@ void pa_alsa_refcnt_dec(void) {
}
}
bool pa_alsa_init_description(pa_proplist *p) {
bool pa_alsa_init_description(pa_proplist *p, pa_card *card) {
const char *d, *k;
pa_assert(p);
if (pa_device_init_description(p))
if (pa_device_init_description(p, card))
return true;
if (!(d = pa_proplist_gets(p, "alsa.card_name")))