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

[pulseaudio] / src / modules / alsa / alsa-source.c

diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 8416ba8ae5b50b1c95992f5751b10d6edadf843b..425f4f0f85f6a710eaedcd69a83f26ea70c4b57f 100644 (file)
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1742,14 +1742,16 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
     map = m->core->default_channel_map;
 
     /* Pick sample spec overrides from the mapping, if any */
-    if (mapping->sample_spec.format != PA_SAMPLE_INVALID)
-        ss.format = mapping->sample_spec.format;
-    if (mapping->sample_spec.rate != 0)
-        ss.rate = mapping->sample_spec.rate;
-    if (mapping->sample_spec.channels != 0) {
-        ss.channels = mapping->sample_spec.channels;
-        if (pa_channel_map_valid(&mapping->channel_map))
-            pa_assert(pa_channel_map_compatible(&mapping->channel_map, &ss));
+    if (mapping) {
+        if (mapping->sample_spec.format != PA_SAMPLE_INVALID)
+            ss.format = mapping->sample_spec.format;
+        if (mapping->sample_spec.rate != 0)
+            ss.rate = mapping->sample_spec.rate;
+        if (mapping->sample_spec.channels != 0) {
+            ss.channels = mapping->sample_spec.channels;
+            if (pa_channel_map_valid(&mapping->channel_map))
+                pa_assert(pa_channel_map_compatible(&mapping->channel_map, &ss));
+        }
     }
 
     /* Override with modargs if provided */
@@ -1982,7 +1984,7 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
             pa_proplist_sets(data.proplist, key, pa_proplist_gets(mapping->proplist, key));
     }
 
-    pa_alsa_init_description(data.proplist);
+    pa_alsa_init_description(data.proplist, card);
 
     if (u->control_device)
         pa_alsa_init_proplist_ctl(data.proplist, u->control_device);