tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Jaroslav Kysela and committed by
Takashi Iwai d355c82a 9dcaa7b2

+47 -45
+2 -1
Documentation/sound/alsa/ControlNames.txt
··· 18 18 Master 19 19 Master Mono 20 20 Hardware Master 21 + Internal Speaker 21 22 Headphone 22 - PC Speaker 23 + Beep (beep generator) 23 24 Phone 24 25 Phone Input 25 26 Phone Output
+2 -1
sound/core/oss/mixer_oss.c
··· 1251 1251 { SOUND_MIXER_SYNTH, "FM", 0 }, /* fallback */ 1252 1252 { SOUND_MIXER_SYNTH, "Music", 0 }, /* fallback */ 1253 1253 { SOUND_MIXER_PCM, "PCM", 0 }, 1254 - { SOUND_MIXER_SPEAKER, "PC Speaker", 0 }, 1254 + { SOUND_MIXER_SPEAKER, "Beep", 0 }, 1255 + { SOUND_MIXER_SPEAKER, "PC Speaker", 0 }, /* fallback */ 1255 1256 { SOUND_MIXER_LINE, "Line", 0 }, 1256 1257 { SOUND_MIXER_MIC, "Mic", 0 }, 1257 1258 { SOUND_MIXER_CD, "CD", 0 },
+1 -1
sound/drivers/pcsp/pcsp_mixer.c
··· 125 125 }; 126 126 127 127 static struct snd_kcontrol_new __devinitdata snd_pcsp_controls_spkr[] = { 128 - PCSP_MIXER_CONTROL(pcspkr, "PC Speaker Playback Switch"), 128 + PCSP_MIXER_CONTROL(pcspkr, "Beep Playback Switch"), 129 129 }; 130 130 131 131 static int __devinit snd_pcsp_ctls_add(struct snd_pcsp *chip,
+2 -2
sound/isa/cmi8330.c
··· 237 237 CMI8330_WAVGAIN, CMI8330_WAVGAIN, 4, 0, 15, 0), 238 238 WSS_SINGLE("3D Control - Switch", 0, 239 239 CMI8330_RMUX3D, 5, 1, 1), 240 - WSS_SINGLE("PC Speaker Playback Volume", 0, 240 + WSS_SINGLE("Beep Playback Volume", 0, 241 241 CMI8330_OUTPUTVOL, 3, 3, 0), 242 242 WSS_DOUBLE("FM Playback Switch", 0, 243 243 CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 7, 7, 1, 1), ··· 262 262 SB_DOUBLE("SB Line Playback Volume", SB_DSP4_LINE_DEV, (SB_DSP4_LINE_DEV + 1), 3, 3, 31), 263 263 SB_SINGLE("SB Mic Playback Switch", SB_DSP4_OUTPUT_SW, 0, 1), 264 264 SB_SINGLE("SB Mic Playback Volume", SB_DSP4_MIC_DEV, 3, 31), 265 - SB_SINGLE("SB PC Speaker Volume", SB_DSP4_SPEAKER_DEV, 6, 3), 265 + SB_SINGLE("SB Beep Volume", SB_DSP4_SPEAKER_DEV, 6, 3), 266 266 SB_DOUBLE("SB Capture Volume", SB_DSP4_IGAIN_DEV, (SB_DSP4_IGAIN_DEV + 1), 6, 6, 3), 267 267 SB_DOUBLE("SB Playback Volume", SB_DSP4_OGAIN_DEV, (SB_DSP4_OGAIN_DEV + 1), 6, 6, 3), 268 268 SB_SINGLE("SB Mic Auto Gain", SB_DSP4_MIC_AGC, 0, 1),
+1 -1
sound/isa/es1688/es1688_lib.c
··· 982 982 ES1688_DOUBLE("FM Playback Volume", 0, ES1688_FM_DEV, ES1688_FM_DEV, 4, 0, 15, 0), 983 983 ES1688_DOUBLE("Mic Playback Volume", 0, ES1688_MIC_DEV, ES1688_MIC_DEV, 4, 0, 15, 0), 984 984 ES1688_DOUBLE("Aux Playback Volume", 0, ES1688_AUX_DEV, ES1688_AUX_DEV, 4, 0, 15, 0), 985 - ES1688_SINGLE("PC Speaker Playback Volume", 0, ES1688_SPEAKER_DEV, 0, 7, 0), 985 + ES1688_SINGLE("Beep Playback Volume", 0, ES1688_SPEAKER_DEV, 0, 7, 0), 986 986 ES1688_DOUBLE("Capture Volume", 0, ES1688_RECLEV_DEV, ES1688_RECLEV_DEV, 4, 0, 15, 0), 987 987 ES1688_SINGLE("Capture Switch", 0, ES1688_REC_DEV, 4, 1, 1), 988 988 {
+1 -1
sound/isa/es18xx.c
··· 1313 1313 * The chipset specific mixer controls 1314 1314 */ 1315 1315 static struct snd_kcontrol_new snd_es18xx_opt_speaker = 1316 - ES18XX_SINGLE("PC Speaker Playback Volume", 0, 0x3c, 0, 7, 0); 1316 + ES18XX_SINGLE("Beep Playback Volume", 0, 0x3c, 0, 7, 0); 1317 1317 1318 1318 static struct snd_kcontrol_new snd_es18xx_opt_1869[] = { 1319 1319 ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1),
+2 -2
sound/isa/sb/sb_mixer.c
··· 631 631 static struct sbmix_elem snd_sb16_ctl_mic_play_vol = 632 632 SB_SINGLE("Mic Playback Volume", SB_DSP4_MIC_DEV, 3, 31); 633 633 static struct sbmix_elem snd_sb16_ctl_pc_speaker_vol = 634 - SB_SINGLE("PC Speaker Volume", SB_DSP4_SPEAKER_DEV, 6, 3); 634 + SB_SINGLE("Beep Volume", SB_DSP4_SPEAKER_DEV, 6, 3); 635 635 static struct sbmix_elem snd_sb16_ctl_capture_vol = 636 636 SB_DOUBLE("Capture Volume", SB_DSP4_IGAIN_DEV, (SB_DSP4_IGAIN_DEV + 1), 6, 6, 3); 637 637 static struct sbmix_elem snd_sb16_ctl_play_vol = ··· 689 689 static struct sbmix_elem snd_dt019x_ctl_mic_play_vol = 690 690 SB_SINGLE("Mic Playback Volume", SB_DT019X_MIC_DEV, 4, 7); 691 691 static struct sbmix_elem snd_dt019x_ctl_pc_speaker_vol = 692 - SB_SINGLE("PC Speaker Volume", SB_DT019X_SPKR_DEV, 0, 7); 692 + SB_SINGLE("Beep Volume", SB_DT019X_SPKR_DEV, 0, 7); 693 693 static struct sbmix_elem snd_dt019x_ctl_line_play_vol = 694 694 SB_DOUBLE("Line Playback Volume", SB_DT019X_LINE_DEV, SB_DT019X_LINE_DEV, 4,0, 15); 695 695 static struct sbmix_elem snd_dt019x_ctl_pcm_play_switch =
+3 -3
sound/pci/ac97/ac97_codec.c
··· 603 603 }; 604 604 605 605 static const struct snd_kcontrol_new snd_ac97_controls_pc_beep[2] = { 606 - AC97_SINGLE("PC Speaker Playback Switch", AC97_PC_BEEP, 15, 1, 1), 607 - AC97_SINGLE("PC Speaker Playback Volume", AC97_PC_BEEP, 1, 15, 1) 606 + AC97_SINGLE("Beep Playback Switch", AC97_PC_BEEP, 15, 1, 1), 607 + AC97_SINGLE("Beep Playback Volume", AC97_PC_BEEP, 1, 15, 1) 608 608 }; 609 609 610 610 static const struct snd_kcontrol_new snd_ac97_controls_mic_boost = ··· 1393 1393 } 1394 1394 } 1395 1395 1396 - /* build PC Speaker controls */ 1396 + /* build Beep controls */ 1397 1397 if (!(ac97->flags & AC97_HAS_NO_PC_BEEP) && 1398 1398 ((ac97->flags & AC97_HAS_PC_BEEP) || 1399 1399 snd_ac97_try_volume_mix(ac97, AC97_PC_BEEP))) {
+6 -6
sound/pci/ac97/ac97_patch.c
··· 800 800 AC97_SINGLE("Mono ZC Switch", AC97_MASTER_TONE, 6, 1, 0), 801 801 AC97_SINGLE("Mono Volume", AC97_MASTER_TONE, 0, 31, 1), 802 802 803 - AC97_SINGLE("PC Beep to Headphone Switch", AC97_AUX, 15, 1, 1), 804 - AC97_SINGLE("PC Beep to Headphone Volume", AC97_AUX, 12, 7, 1), 805 - AC97_SINGLE("PC Beep to Master Switch", AC97_AUX, 11, 1, 1), 806 - AC97_SINGLE("PC Beep to Master Volume", AC97_AUX, 8, 7, 1), 807 - AC97_SINGLE("PC Beep to Mono Switch", AC97_AUX, 7, 1, 1), 808 - AC97_SINGLE("PC Beep to Mono Volume", AC97_AUX, 4, 7, 1), 803 + AC97_SINGLE("Beep to Headphone Switch", AC97_AUX, 15, 1, 1), 804 + AC97_SINGLE("Beep to Headphone Volume", AC97_AUX, 12, 7, 1), 805 + AC97_SINGLE("Beep to Master Switch", AC97_AUX, 11, 1, 1), 806 + AC97_SINGLE("Beep to Master Volume", AC97_AUX, 8, 7, 1), 807 + AC97_SINGLE("Beep to Mono Switch", AC97_AUX, 7, 1, 1), 808 + AC97_SINGLE("Beep to Mono Volume", AC97_AUX, 4, 7, 1), 809 809 810 810 AC97_SINGLE("Voice to Headphone Switch", AC97_PCM, 15, 1, 1), 811 811 AC97_SINGLE("Voice to Headphone Volume", AC97_PCM, 12, 7, 1),
+2 -2
sound/pci/azt3328.c
··· 830 830 AZF3328_MIXER_SWITCH("Mic Boost (+20dB)", IDX_MIXER_MIC, 6, 0), 831 831 AZF3328_MIXER_SWITCH("Line Playback Switch", IDX_MIXER_LINEIN, 15, 1), 832 832 AZF3328_MIXER_VOL_STEREO("Line Playback Volume", IDX_MIXER_LINEIN, 0x1f, 1), 833 - AZF3328_MIXER_SWITCH("PC Speaker Playback Switch", IDX_MIXER_PCBEEP, 15, 1), 834 - AZF3328_MIXER_VOL_SPECIAL("PC Speaker Playback Volume", IDX_MIXER_PCBEEP, 0x0f, 1, 1), 833 + AZF3328_MIXER_SWITCH("Beep Playback Switch", IDX_MIXER_PCBEEP, 15, 1), 834 + AZF3328_MIXER_VOL_SPECIAL("Beep Playback Volume", IDX_MIXER_PCBEEP, 0x0f, 1, 1), 835 835 AZF3328_MIXER_SWITCH("Video Playback Switch", IDX_MIXER_VIDEO, 15, 1), 836 836 AZF3328_MIXER_VOL_STEREO("Video Playback Volume", IDX_MIXER_VIDEO, 0x1f, 1), 837 837 AZF3328_MIXER_SWITCH("Aux Playback Switch", IDX_MIXER_AUX, 15, 1),
+2 -2
sound/pci/ca0106/ca0106_mixer.c
··· 792 792 "Phone Playback Volume", 793 793 "Video Playback Switch", 794 794 "Video Playback Volume", 795 - "PC Speaker Playback Switch", 796 - "PC Speaker Playback Volume", 795 + "Beep Playback Switch", 796 + "Beep Playback Volume", 797 797 "Mono Output Select", 798 798 "Capture Source", 799 799 "Capture Switch",
+2 -2
sound/pci/cmipci.c
··· 2302 2302 CMIPCI_SB_VOL_MONO("Mic Playback Volume", SB_DSP4_MIC_DEV, 3, 31), 2303 2303 CMIPCI_SB_SW_MONO("Mic Playback Switch", 0), 2304 2304 CMIPCI_DOUBLE("Mic Capture Switch", SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT, 0, 0, 1, 0, 0), 2305 - CMIPCI_SB_VOL_MONO("PC Speaker Playback Volume", SB_DSP4_SPEAKER_DEV, 6, 3), 2305 + CMIPCI_SB_VOL_MONO("Beep Playback Volume", SB_DSP4_SPEAKER_DEV, 6, 3), 2306 2306 CMIPCI_MIXER_VOL_STEREO("Aux Playback Volume", CM_REG_AUX_VOL, 4, 0, 15), 2307 2307 CMIPCI_MIXER_SW_STEREO("Aux Playback Switch", CM_REG_MIXER2, CM_VAUXLM_SHIFT, CM_VAUXRM_SHIFT, 0), 2308 2308 CMIPCI_MIXER_SW_STEREO("Aux Capture Switch", CM_REG_MIXER2, CM_RAUXLEN_SHIFT, CM_RAUXREN_SHIFT, 0), ··· 2310 2310 CMIPCI_MIXER_VOL_MONO("Mic Capture Volume", CM_REG_MIXER2, CM_VADMIC_SHIFT, 7), 2311 2311 CMIPCI_SB_VOL_MONO("Phone Playback Volume", CM_REG_EXTENT_IND, 5, 7), 2312 2312 CMIPCI_DOUBLE("Phone Playback Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 4, 4, 1, 0, 0), 2313 - CMIPCI_DOUBLE("PC Speaker Playback Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 3, 3, 1, 0, 0), 2313 + CMIPCI_DOUBLE("Beep Playback Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 3, 3, 1, 0, 0), 2314 2314 CMIPCI_DOUBLE("Mic Boost Capture Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 0, 0, 1, 0, 0), 2315 2315 }; 2316 2316
+2 -2
sound/pci/emu10k1/emumixer.c
··· 1818 1818 "Master Playback Switch", "Master Capture Switch", 1819 1819 "Master Playback Volume", "Master Capture Volume", 1820 1820 "Wave Master Playback Volume", "Master Playback Volume", 1821 - "PC Speaker Playback Switch", "PC Speaker Capture Switch", 1822 - "PC Speaker Playback Volume", "PC Speaker Capture Volume", 1821 + "Beep Playback Switch", "Beep Capture Switch", 1822 + "Beep Playback Volume", "Beep Capture Volume", 1823 1823 "Phone Playback Switch", "Phone Capture Switch", 1824 1824 "Phone Playback Volume", "Phone Capture Volume", 1825 1825 "Mic Playback Switch", "Mic Capture Switch",
+1 -1
sound/pci/es1938.c
··· 1387 1387 db_scale_line), 1388 1388 ES1938_DOUBLE_TLV("Capture Volume", 0, 0xb4, 0xb4, 4, 0, 15, 0, 1389 1389 db_scale_capture), 1390 - ES1938_SINGLE("PC Speaker Volume", 0, 0x3c, 0, 7, 0), 1390 + ES1938_SINGLE("Beep Volume", 0, 0x3c, 0, 7, 0), 1391 1391 ES1938_SINGLE("Record Monitor", 0, 0xa8, 3, 1, 0), 1392 1392 ES1938_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1), 1393 1393 {
+2 -2
sound/pci/hda/patch_cmedia.c
··· 197 197 HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0, HDA_INPUT), 198 198 HDA_CODEC_MUTE("Capture Switch", 0x08, 0, HDA_INPUT), 199 199 HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0, HDA_INPUT), 200 - HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x23, 0, HDA_OUTPUT), 201 - HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x23, 0, HDA_OUTPUT), 200 + HDA_CODEC_VOLUME("Beep Playback Volume", 0x23, 0, HDA_OUTPUT), 201 + HDA_CODEC_MUTE("Beep Playback Switch", 0x23, 0, HDA_OUTPUT), 202 202 { } /* end */ 203 203 }; 204 204
+2 -2
sound/pci/hda/patch_realtek.c
··· 7334 7334 HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x01, HDA_INPUT), 7335 7335 HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x01, HDA_INPUT), 7336 7336 /* FIXME: this looks suspicious... 7337 - HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x02, HDA_INPUT), 7338 - HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x02, HDA_INPUT), 7337 + HDA_CODEC_VOLUME("Beep Playback Volume", 0x0b, 0x02, HDA_INPUT), 7338 + HDA_CODEC_MUTE("Beep Playback Switch", 0x0b, 0x02, HDA_INPUT), 7339 7339 */ 7340 7340 { } /* end */ 7341 7341 };
+3 -3
sound/pci/hda/patch_sigmatel.c
··· 3221 3221 /* check for mute support for the the amp */ 3222 3222 if ((caps & AC_AMPCAP_MUTE) >> AC_AMPCAP_MUTE_SHIFT) { 3223 3223 err = stac92xx_add_control(spec, STAC_CTL_WIDGET_MUTE, 3224 - "PC Beep Playback Switch", 3224 + "Beep Playback Switch", 3225 3225 HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT)); 3226 3226 if (err < 0) 3227 3227 return err; ··· 3230 3230 /* check to see if there is volume support for the amp */ 3231 3231 if ((caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT) { 3232 3232 err = stac92xx_add_control(spec, STAC_CTL_WIDGET_VOL, 3233 - "PC Beep Playback Volume", 3233 + "Beep Playback Volume", 3234 3234 HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT)); 3235 3235 if (err < 0) 3236 3236 return err; ··· 3271 3271 static int stac92xx_beep_switch_ctl(struct hda_codec *codec) 3272 3272 { 3273 3273 return stac92xx_add_control_temp(codec->spec, &stac92xx_dig_beep_ctrl, 3274 - 0, "PC Beep Playback Switch", 0); 3274 + 0, "Beep Playback Switch", 0); 3275 3275 } 3276 3276 #endif 3277 3277
+11 -11
sound/soc/codecs/wm9713.c
··· 165 165 SOC_SINGLE("Mono Playback ZC Switch", AC97_MASTER_TONE, 6, 1, 0), 166 166 SOC_SINGLE("Mono Playback Volume", AC97_MASTER_TONE, 0, 31, 1), 167 167 168 - SOC_SINGLE("PC Beep Playback Headphone Volume", AC97_AUX, 12, 7, 1), 169 - SOC_SINGLE("PC Beep Playback Speaker Volume", AC97_AUX, 8, 7, 1), 170 - SOC_SINGLE("PC Beep Playback Mono Volume", AC97_AUX, 4, 7, 1), 168 + SOC_SINGLE("Beep Playback Headphone Volume", AC97_AUX, 12, 7, 1), 169 + SOC_SINGLE("Beep Playback Speaker Volume", AC97_AUX, 8, 7, 1), 170 + SOC_SINGLE("Beep Playback Mono Volume", AC97_AUX, 4, 7, 1), 171 171 172 172 SOC_SINGLE("Voice Playback Headphone Volume", AC97_PCM, 12, 7, 1), 173 173 SOC_SINGLE("Voice Playback Master Volume", AC97_PCM, 8, 7, 1), ··· 266 266 267 267 /* Left Headphone Mixers */ 268 268 static const struct snd_kcontrol_new wm9713_hpl_mixer_controls[] = { 269 - SOC_DAPM_SINGLE("PC Beep Playback Switch", HPL_MIXER, 5, 1, 0), 269 + SOC_DAPM_SINGLE("Beep Playback Switch", HPL_MIXER, 5, 1, 0), 270 270 SOC_DAPM_SINGLE("Voice Playback Switch", HPL_MIXER, 4, 1, 0), 271 271 SOC_DAPM_SINGLE("Aux Playback Switch", HPL_MIXER, 3, 1, 0), 272 272 SOC_DAPM_SINGLE("PCM Playback Switch", HPL_MIXER, 2, 1, 0), ··· 276 276 277 277 /* Right Headphone Mixers */ 278 278 static const struct snd_kcontrol_new wm9713_hpr_mixer_controls[] = { 279 - SOC_DAPM_SINGLE("PC Beep Playback Switch", HPR_MIXER, 5, 1, 0), 279 + SOC_DAPM_SINGLE("Beep Playback Switch", HPR_MIXER, 5, 1, 0), 280 280 SOC_DAPM_SINGLE("Voice Playback Switch", HPR_MIXER, 4, 1, 0), 281 281 SOC_DAPM_SINGLE("Aux Playback Switch", HPR_MIXER, 3, 1, 0), 282 282 SOC_DAPM_SINGLE("PCM Playback Switch", HPR_MIXER, 2, 1, 0), ··· 294 294 295 295 /* Speaker Mixer */ 296 296 static const struct snd_kcontrol_new wm9713_speaker_mixer_controls[] = { 297 - SOC_DAPM_SINGLE("PC Beep Playback Switch", AC97_AUX, 11, 1, 1), 297 + SOC_DAPM_SINGLE("Beep Playback Switch", AC97_AUX, 11, 1, 1), 298 298 SOC_DAPM_SINGLE("Voice Playback Switch", AC97_PCM, 11, 1, 1), 299 299 SOC_DAPM_SINGLE("Aux Playback Switch", AC97_REC_SEL, 11, 1, 1), 300 300 SOC_DAPM_SINGLE("PCM Playback Switch", AC97_PHONE, 14, 1, 1), ··· 304 304 305 305 /* Mono Mixer */ 306 306 static const struct snd_kcontrol_new wm9713_mono_mixer_controls[] = { 307 - SOC_DAPM_SINGLE("PC Beep Playback Switch", AC97_AUX, 7, 1, 1), 307 + SOC_DAPM_SINGLE("Beep Playback Switch", AC97_AUX, 7, 1, 1), 308 308 SOC_DAPM_SINGLE("Voice Playback Switch", AC97_PCM, 7, 1, 1), 309 309 SOC_DAPM_SINGLE("Aux Playback Switch", AC97_REC_SEL, 7, 1, 1), 310 310 SOC_DAPM_SINGLE("PCM Playback Switch", AC97_PHONE, 13, 1, 1), ··· 463 463 464 464 static const struct snd_soc_dapm_route audio_map[] = { 465 465 /* left HP mixer */ 466 - {"Left HP Mixer", "PC Beep Playback Switch", "PCBEEP"}, 466 + {"Left HP Mixer", "Beep Playback Switch", "PCBEEP"}, 467 467 {"Left HP Mixer", "Voice Playback Switch", "Voice DAC"}, 468 468 {"Left HP Mixer", "Aux Playback Switch", "Aux DAC"}, 469 469 {"Left HP Mixer", "Bypass Playback Switch", "Left Line In"}, ··· 472 472 {"Left HP Mixer", NULL, "Capture Headphone Mux"}, 473 473 474 474 /* right HP mixer */ 475 - {"Right HP Mixer", "PC Beep Playback Switch", "PCBEEP"}, 475 + {"Right HP Mixer", "Beep Playback Switch", "PCBEEP"}, 476 476 {"Right HP Mixer", "Voice Playback Switch", "Voice DAC"}, 477 477 {"Right HP Mixer", "Aux Playback Switch", "Aux DAC"}, 478 478 {"Right HP Mixer", "Bypass Playback Switch", "Right Line In"}, ··· 491 491 {"Capture Mixer", NULL, "Right Capture Source"}, 492 492 493 493 /* speaker mixer */ 494 - {"Speaker Mixer", "PC Beep Playback Switch", "PCBEEP"}, 494 + {"Speaker Mixer", "Beep Playback Switch", "PCBEEP"}, 495 495 {"Speaker Mixer", "Voice Playback Switch", "Voice DAC"}, 496 496 {"Speaker Mixer", "Aux Playback Switch", "Aux DAC"}, 497 497 {"Speaker Mixer", "Bypass Playback Switch", "Line Mixer"}, ··· 499 499 {"Speaker Mixer", "MonoIn Playback Switch", "Mono In"}, 500 500 501 501 /* mono mixer */ 502 - {"Mono Mixer", "PC Beep Playback Switch", "PCBEEP"}, 502 + {"Mono Mixer", "Beep Playback Switch", "PCBEEP"}, 503 503 {"Mono Mixer", "Voice Playback Switch", "Voice DAC"}, 504 504 {"Mono Mixer", "Aux Playback Switch", "Aux DAC"}, 505 505 {"Mono Mixer", "Bypass Playback Switch", "Line Mixer"},