ALSA: emu10k1 - Remove "Front" controls only for STAC9758/59
Remove "Front Playback Volume" and "Front Playback Switch" from emu10k1 only for STAC9758/59 Since commit7eae36fbd5
"Fix the confliction of 'Front' control", the "Front Playback Volume" control created by commitedf8e4565c
"emu10k1: Front channels via fxbus 8 and 9" was removed "Front Playback Volume" and "Surround Playback Volume" have same dB range since I2S DAC of SB Live! and SB Live! Platinum does not has any hardware volume control. Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
9cdc352936
commit
b6a4840408
|
@ -1729,8 +1729,6 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
|
||||||
"Master Mono Playback Volume",
|
"Master Mono Playback Volume",
|
||||||
"PCM Out Path & Mute",
|
"PCM Out Path & Mute",
|
||||||
"Mono Output Select",
|
"Mono Output Select",
|
||||||
"Front Playback Switch",
|
|
||||||
"Front Playback Volume",
|
|
||||||
"Surround Playback Switch",
|
"Surround Playback Switch",
|
||||||
"Surround Playback Volume",
|
"Surround Playback Volume",
|
||||||
"Center Playback Switch",
|
"Center Playback Switch",
|
||||||
|
@ -1879,6 +1877,8 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
|
||||||
emu->rear_ac97 = 1;
|
emu->rear_ac97 = 1;
|
||||||
snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT);
|
snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT);
|
||||||
snd_ac97_write_cache(emu->ac97, AC97_HEADPHONE, 0x0202);
|
snd_ac97_write_cache(emu->ac97, AC97_HEADPHONE, 0x0202);
|
||||||
|
remove_ctl(card,"Front Playback Volume");
|
||||||
|
remove_ctl(card,"Front Playback Switch");
|
||||||
}
|
}
|
||||||
/* remove unused AC97 controls */
|
/* remove unused AC97 controls */
|
||||||
snd_ac97_write_cache(emu->ac97, AC97_SURROUND_MASTER, 0x0202);
|
snd_ac97_write_cache(emu->ac97, AC97_SURROUND_MASTER, 0x0202);
|
||||||
|
|
Loading…
Reference in a new issue