ALSA: hda - Use "Capture Source" for single sources
authorTakashi Iwai <tiwai@suse.de>
Wed, 19 Dec 2012 16:41:52 +0000 (17:41 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 12 Jan 2013 07:31:04 +0000 (08:31 +0100)
In general we prefer "Capture Source" to "Input Source".
The latter was chosen in many places just because "Capture Source"
label doesn't work well with the current alsa-lib mixer abstraction
when multiple instances are present.  But when we know that there is a
single input-source element, we can safely choose "Capture Source"
label.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_generic.c

index 6914d70..f8d1d03 100644 (file)
@@ -2172,7 +2172,9 @@ static int create_capture_mixers(struct hda_codec *codec)
 
        if (!spec->auto_mic && imux->num_items > 1) {
                struct snd_kcontrol_new *knew;
-               knew = snd_hda_gen_add_kctl(spec, NULL, &cap_src_temp);
+               const char *name;
+               name = nums > 1 ? "Input Source" : "Capture Source";
+               knew = snd_hda_gen_add_kctl(spec, name, &cap_src_temp);
                if (!knew)
                        return -ENOMEM;
                knew->count = nums;