Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a607148f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Set individual name to secondary analog PCM stream 



It'd be better to give another name to the secondary (alt) analog PCM
stream, which is dedicated for the independent HP out and extra
inputs.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f2f8be43

sound/pci/hda/hda_generic.c

+4 −1
Original line number Diff line number Diff line
@@ -4531,9 +4531,12 @@ int snd_hda_gen_build_pcms(struct hda_codec *codec) 
		!spec->dyn_adc_switch && !spec->auto_mic;

	/* Additional Analaog capture for index #2 */

	if (spec->alt_dac_nid || have_multi_adcs) {

		fill_pcm_stream_name(spec->stream_name_alt_analog,

				     sizeof(spec->stream_name_alt_analog),

			     " Alt Analog", codec->chip_name);

		codec->num_pcms = 3;

		info = spec->pcm_rec + 2;

		info->name = spec->stream_name_analog;

		info->name = spec->stream_name_alt_analog;

		if (spec->alt_dac_nid) {

			p = spec->stream_analog_alt_playback;

			if (!p)

sound/pci/hda/hda_generic.h

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ struct hda_gen_spec { 
	char stream_name_analog[32];	/* analog PCM stream */

	const struct hda_pcm_stream *stream_analog_playback;

	const struct hda_pcm_stream *stream_analog_capture;



	char stream_name_alt_analog[32]; /* alternative analog PCM stream */

	const struct hda_pcm_stream *stream_analog_alt_playback;

	const struct hda_pcm_stream *stream_analog_alt_capture;