Skip to content

Commit

Permalink
ALSA: hda - Use "Capture Source" for single sources
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai committed Jan 12, 2013
1 parent 08c189f commit 624d914
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion sound/pci/hda/hda_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 624d914

Please sign in to comment.