projects
/
platform
/
upstream
/
pulseaudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ba3c766
)
don't put both the card and the pcm name in the description of a device if one contai...
author
Lennart Poettering
<lennart@poettering.net>
Tue, 24 Feb 2009 10:29:11 +0000
(11:29 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 24 Feb 2009 10:29:11 +0000
(11:29 +0100)
src/modules/alsa/alsa-util.c
patch
|
blob
|
history
diff --git
a/src/modules/alsa/alsa-util.c
b/src/modules/alsa/alsa-util.c
index
ec20d1d
..
6740c06
100644
(file)
--- a/
src/modules/alsa/alsa-util.c
+++ b/
src/modules/alsa/alsa-util.c
@@
-1448,9
+1448,9
@@
void pa_alsa_init_proplist_pcm_info(pa_core *c, pa_proplist *p, snd_pcm_info_t *
cn = pa_proplist_gets(p, "alsa.card_name");
}
- if (cn && n)
- pa_proplist_setf(p, PA_PROP_DEVICE_DESCRIPTION, "%s
-
%s", cn, n);
- else if (cn)
+ if (cn && n
&& !strstr(cn, n) && !strstr(n, cn)
)
+ pa_proplist_setf(p, PA_PROP_DEVICE_DESCRIPTION, "%s
,
%s", cn, n);
+ else if (cn
&& (!n || strstr(cn, n))
)
pa_proplist_sets(p, PA_PROP_DEVICE_DESCRIPTION, cn);
else if (n)
pa_proplist_sets(p, PA_PROP_DEVICE_DESCRIPTION, n);