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

Commit d355c82a authored by Jaroslav Kysela's avatar Jaroslav Kysela Committed by Takashi Iwai
Browse files

ALSA: rename "PC Speaker" and "PC Beep" controls to "Beep" 



To avoid confusion in control names for the standard analog PC Beep generator
using a small Internal PC Speaker, rename all related "PC Speaker" and "PC
Beep" controls to "Beep" only. This name is more universal and can be also
used on more platforms without confusion.

Introduce also "Internal Speaker" in ControlNames.txt for systems with
full-featured build-in internal speaker.

Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9dcaa7b2

Documentation/sound/alsa/ControlNames.txt

+2 −1
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ SOURCE: 
  Master

  Master Mono

  Hardware Master

  Internal Speaker

  Headphone

  PC Speaker

  Beep		(beep generator)

  Phone

  Phone Input

  Phone Output

sound/core/oss/mixer_oss.c

+2 −1
Original line number Diff line number Diff line
@@ -1251,7 +1251,8 @@ static void snd_mixer_oss_build(struct snd_mixer_oss *mixer) 
		{ SOUND_MIXER_SYNTH,	"FM",			0 }, /* fallback */

		{ SOUND_MIXER_SYNTH,	"Music",		0 }, /* fallback */

		{ SOUND_MIXER_PCM,	"PCM",			0 },

		{ SOUND_MIXER_SPEAKER,	"PC Speaker", 		0 },

		{ SOUND_MIXER_SPEAKER,	"Beep", 		0 },

		{ SOUND_MIXER_SPEAKER,	"PC Speaker", 		0 }, /* fallback */

		{ SOUND_MIXER_LINE,	"Line", 		0 },

		{ SOUND_MIXER_MIC,	"Mic", 			0 },

		{ SOUND_MIXER_CD,	"CD", 			0 },

sound/drivers/pcsp/pcsp_mixer.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static struct snd_kcontrol_new __devinitdata snd_pcsp_controls_pcm[] = { 
};



static struct snd_kcontrol_new __devinitdata snd_pcsp_controls_spkr[] = {

	PCSP_MIXER_CONTROL(pcspkr, "PC Speaker Playback Switch"),

	PCSP_MIXER_CONTROL(pcspkr, "Beep Playback Switch"),

};



static int __devinit snd_pcsp_ctls_add(struct snd_pcsp *chip,

sound/isa/cmi8330.c

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ WSS_DOUBLE("Wavetable Capture Volume", 0, 
		CMI8330_WAVGAIN, CMI8330_WAVGAIN, 4, 0, 15, 0),

WSS_SINGLE("3D Control - Switch", 0,

		CMI8330_RMUX3D, 5, 1, 1),

WSS_SINGLE("PC Speaker Playback Volume", 0,

WSS_SINGLE("Beep Playback Volume", 0,

		CMI8330_OUTPUTVOL, 3, 3, 0),

WSS_DOUBLE("FM Playback Switch", 0,

		CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 7, 7, 1, 1),
@@ -262,7 +262,7 @@ SB_DOUBLE("SB Line Playback Switch", SB_DSP4_OUTPUT_SW, SB_DSP4_OUTPUT_SW, 4, 3, 
SB_DOUBLE("SB Line Playback Volume", SB_DSP4_LINE_DEV, (SB_DSP4_LINE_DEV + 1), 3, 3, 31),

SB_SINGLE("SB Mic Playback Switch", SB_DSP4_OUTPUT_SW, 0, 1),

SB_SINGLE("SB Mic Playback Volume", SB_DSP4_MIC_DEV, 3, 31),

SB_SINGLE("SB PC Speaker Volume", SB_DSP4_SPEAKER_DEV, 6, 3),

SB_SINGLE("SB Beep Volume", SB_DSP4_SPEAKER_DEV, 6, 3),

SB_DOUBLE("SB Capture Volume", SB_DSP4_IGAIN_DEV, (SB_DSP4_IGAIN_DEV + 1), 6, 6, 3),

SB_DOUBLE("SB Playback Volume", SB_DSP4_OGAIN_DEV, (SB_DSP4_OGAIN_DEV + 1), 6, 6, 3),

SB_SINGLE("SB Mic Auto Gain", SB_DSP4_MIC_AGC, 0, 1),

sound/isa/es1688/es1688_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ ES1688_DOUBLE("CD Playback Volume", 0, ES1688_CD_DEV, ES1688_CD_DEV, 4, 0, 15, 0 
ES1688_DOUBLE("FM Playback Volume", 0, ES1688_FM_DEV, ES1688_FM_DEV, 4, 0, 15, 0),

ES1688_DOUBLE("Mic Playback Volume", 0, ES1688_MIC_DEV, ES1688_MIC_DEV, 4, 0, 15, 0),

ES1688_DOUBLE("Aux Playback Volume", 0, ES1688_AUX_DEV, ES1688_AUX_DEV, 4, 0, 15, 0),

ES1688_SINGLE("PC Speaker Playback Volume", 0, ES1688_SPEAKER_DEV, 0, 7, 0),

ES1688_SINGLE("Beep Playback Volume", 0, ES1688_SPEAKER_DEV, 0, 7, 0),

ES1688_DOUBLE("Capture Volume", 0, ES1688_RECLEV_DEV, ES1688_RECLEV_DEV, 4, 0, 15, 0),

ES1688_SINGLE("Capture Switch", 0, ES1688_REC_DEV, 4, 1, 1),

{