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

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



To unify control names, rename "PC Speaker" to "Speaker" for PPC ALSA drivers.

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

Documentation/sound/alsa/ControlNames.txt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ SOURCE: 
  Master

  Master Mono

  Hardware Master

  Internal Speaker

  Speaker	(internal speaker)

  Headphone

  Beep		(beep generator)

  Phone

sound/core/oss/mixer_oss.c

+1 −0
Original line number Diff line number Diff line
@@ -1253,6 +1253,7 @@ static void snd_mixer_oss_build(struct snd_mixer_oss *mixer) 
		{ SOUND_MIXER_PCM,	"PCM",			0 },

		{ SOUND_MIXER_SPEAKER,	"Beep", 		0 },

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

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

		{ SOUND_MIXER_LINE,	"Line", 		0 },

		{ SOUND_MIXER_MIC,	"Mic", 			0 },

		{ SOUND_MIXER_CD,	"CD", 			0 },

sound/ppc/awacs.c

+6 −6
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static int snd_pmac_awacs_put_master_amp(struct snd_kcontrol *kcontrol, 


static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] __devinitdata = {

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	  .name = "PC Speaker Playback Volume",

	  .name = "Speaker Playback Volume",

	  .info = snd_pmac_awacs_info_volume_amp,

	  .get = snd_pmac_awacs_get_volume_amp,

	  .put = snd_pmac_awacs_put_volume_amp,
@@ -525,7 +525,7 @@ static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw __devinitdata = { 


static struct snd_kcontrol_new snd_pmac_awacs_amp_spk_sw __devinitdata = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "PC Speaker Playback Switch",

	.name = "Speaker Playback Switch",

	.info = snd_pmac_boolean_stereo_info,

	.get = snd_pmac_awacs_get_switch_amp,

	.put = snd_pmac_awacs_put_switch_amp,
@@ -696,17 +696,17 @@ static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_imac[] __devinitdata 
};



static struct snd_kcontrol_new snd_pmac_awacs_speaker_vol[] __devinitdata = {

	AWACS_VOLUME("PC Speaker Playback Volume", 4, 6, 1),

	AWACS_VOLUME("Speaker Playback Volume", 4, 6, 1),

};



static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw __devinitdata =

AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_SPKMUTE, 1);

AWACS_SWITCH("Speaker Playback Switch", 1, SHIFT_SPKMUTE, 1);



static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac1 __devinitdata =

AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 1);

AWACS_SWITCH("Speaker Playback Switch", 1, SHIFT_PAROUT1, 1);



static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac2 __devinitdata =

AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 0);

AWACS_SWITCH("Speaker Playback Switch", 1, SHIFT_PAROUT1, 0);





/*

sound/ppc/burgundy.c

+4 −4
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __devinitdata = { 
			MASK_ADDR_BURGUNDY_GAINLINE, 1, 0),

	BURGUNDY_VOLUME_B("Mic Gain Capture Volume", 0,

			MASK_ADDR_BURGUNDY_GAINMIC, 1, 0),

	BURGUNDY_VOLUME_B("PC Speaker Playback Volume", 0,

	BURGUNDY_VOLUME_B("Speaker Playback Volume", 0,

			MASK_ADDR_BURGUNDY_ATTENSPEAKER, 1, 1),

	BURGUNDY_VOLUME_B("Line out Playback Volume", 0,

			MASK_ADDR_BURGUNDY_ATTENLINEOUT, 1, 1),
@@ -527,7 +527,7 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __devinitdata = { 
			MASK_ADDR_BURGUNDY_VOLMIC, 16),

	BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0,

			MASK_ADDR_BURGUNDY_GAINMIC, 1, 0),

	BURGUNDY_VOLUME_B("PC Speaker Playback Volume", 0,

	BURGUNDY_VOLUME_B("Speaker Playback Volume", 0,

			MASK_ADDR_BURGUNDY_ATTENMONO, 0, 1),

	BURGUNDY_VOLUME_B("Line out Playback Volume", 0,

			MASK_ADDR_BURGUNDY_ATTENSPEAKER, 1, 1),
@@ -549,11 +549,11 @@ BURGUNDY_SWITCH_B("Master Playback Switch", 0, 
	BURGUNDY_OUTPUT_INTERN

	| BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);

static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac __devinitdata =

BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0,

BURGUNDY_SWITCH_B("Speaker Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);

static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac __devinitdata =

BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0,

BURGUNDY_SWITCH_B("Speaker Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_OUTPUT_INTERN, 0, 0);

static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac __devinitdata =

sound/ppc/tumbler.c

+1 −1
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ static struct snd_kcontrol_new tumbler_hp_sw __devinitdata = { 
};

static struct snd_kcontrol_new tumbler_speaker_sw __devinitdata = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "PC Speaker Playback Switch",

	.name = "Speaker Playback Switch",

	.info = snd_pmac_boolean_mono_info,

	.get = tumbler_get_mute_switch,

	.put = tumbler_put_mute_switch,