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

Commit 274b2000 authored by Maciej S. Szmigiero's avatar Maciej S. Szmigiero Committed by Takashi Iwai
Browse files

ALSA: emu10k1: remove unused AC'97 mixer controls on Audigy 



AC'97 Headphone output and EAPD control aren't used
on Audigy so remove them from mixer.

Also remove AC'97 3D control as the driver is
already doing for Audigys with 1361T ADC.

Signed-off-by: default avatarMaciej Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d1f15e06

sound/pci/emu10k1/emumixer.c

+6 −5
Original line number Diff line number Diff line
@@ -1830,10 +1830,16 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, 
		"Capture Switch",

		"Capture Volume",

		"Mic Select",

		"Headphone Playback Switch",

		"Headphone Playback Volume",

		"3D Control - Center",

		"3D Control - Depth",

		"3D Control - Switch",

		"Video Playback Switch",

		"Video Playback Volume",

		"Mic Playback Switch",

		"Mic Playback Volume",

		"External Amplifier",

		NULL

	};

	static char *audigy_rename_ctls[] = {
@@ -1996,11 +2002,6 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, 
		rename_ctl(card, "Analog Mix Capture Volume", "Line2 Capture Volume");

		rename_ctl(card, "Aux2 Capture Volume", "Line3 Capture Volume");

		rename_ctl(card, "Mic Capture Volume", "Unknown1 Capture Volume");

		remove_ctl(card, "Headphone Playback Switch");

		remove_ctl(card, "Headphone Playback Volume");

		remove_ctl(card, "3D Control - Center");

		remove_ctl(card, "3D Control - Depth");

		remove_ctl(card, "3D Control - Switch");

	}

	if ((kctl = emu->ctl_send_routing = snd_ctl_new1(&snd_emu10k1_send_routing_control, emu)) == NULL)

		return -ENOMEM;