提交 e49a3434 编写于 作者: T Takashi Iwai

ALSA: hda - Kill hyphenated names

Kill hyphens from "Line-Out" name strings, as suggested by Mark Brown.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 b3999970
...@@ -5118,7 +5118,7 @@ static int fill_audio_out_name(struct hda_codec *codec, hda_nid_t nid, ...@@ -5118,7 +5118,7 @@ static int fill_audio_out_name(struct hda_codec *codec, hda_nid_t nid,
const char *pfx = "", *sfx = ""; const char *pfx = "", *sfx = "";
/* handle as a speaker if it's a fixed line-out */ /* handle as a speaker if it's a fixed line-out */
if (!strcmp(name, "Line-Out") && attr == INPUT_PIN_ATTR_INT) if (!strcmp(name, "Line Out") && attr == INPUT_PIN_ATTR_INT)
name = "Speaker"; name = "Speaker";
/* check the location */ /* check the location */
switch (attr) { switch (attr) {
...@@ -5177,7 +5177,7 @@ int snd_hda_get_pin_label(struct hda_codec *codec, hda_nid_t nid, ...@@ -5177,7 +5177,7 @@ int snd_hda_get_pin_label(struct hda_codec *codec, hda_nid_t nid,
switch (get_defcfg_device(def_conf)) { switch (get_defcfg_device(def_conf)) {
case AC_JACK_LINE_OUT: case AC_JACK_LINE_OUT:
return fill_audio_out_name(codec, nid, cfg, "Line-Out", return fill_audio_out_name(codec, nid, cfg, "Line Out",
label, maxlen, indexp); label, maxlen, indexp);
case AC_JACK_SPEAKER: case AC_JACK_SPEAKER:
return fill_audio_out_name(codec, nid, cfg, "Speaker", return fill_audio_out_name(codec, nid, cfg, "Speaker",
......
...@@ -609,7 +609,7 @@ static int add_output(struct hda_codec *codec, hda_nid_t dac, int idx, ...@@ -609,7 +609,7 @@ static int add_output(struct hda_codec *codec, hda_nid_t dac, int idx,
"Front Speaker", "Surround Speaker", "Bass Speaker" "Front Speaker", "Surround Speaker", "Bass Speaker"
}; };
static const char * const line_outs[] = { static const char * const line_outs[] = {
"Front Line-Out", "Surround Line-Out", "Bass Line-Out" "Front Line Out", "Surround Line Out", "Bass Line Out"
}; };
fix_volume_caps(codec, dac); fix_volume_caps(codec, dac);
...@@ -635,7 +635,7 @@ static int add_output(struct hda_codec *codec, hda_nid_t dac, int idx, ...@@ -635,7 +635,7 @@ static int add_output(struct hda_codec *codec, hda_nid_t dac, int idx,
if (num_ctls > 1) if (num_ctls > 1)
name = line_outs[idx]; name = line_outs[idx];
else else
name = "Line-Out"; name = "Line Out";
break; break;
} }
......
...@@ -3482,7 +3482,7 @@ static int cx_automute_mode_info(struct snd_kcontrol *kcontrol, ...@@ -3482,7 +3482,7 @@ static int cx_automute_mode_info(struct snd_kcontrol *kcontrol,
"Disabled", "Enabled" "Disabled", "Enabled"
}; };
static const char * const texts3[] = { static const char * const texts3[] = {
"Disabled", "Speaker Only", "Line-Out+Speaker" "Disabled", "Speaker Only", "Line Out+Speaker"
}; };
const char * const *texts; const char * const *texts;
......
...@@ -802,7 +802,7 @@ static int alc_automute_mode_info(struct snd_kcontrol *kcontrol, ...@@ -802,7 +802,7 @@ static int alc_automute_mode_info(struct snd_kcontrol *kcontrol,
"Disabled", "Enabled" "Disabled", "Enabled"
}; };
static const char * const texts3[] = { static const char * const texts3[] = {
"Disabled", "Speaker Only", "Line-Out+Speaker" "Disabled", "Speaker Only", "Line Out+Speaker"
}; };
const char * const *texts; const char * const *texts;
...@@ -1856,7 +1856,7 @@ static const char * const alc_slave_vols[] = { ...@@ -1856,7 +1856,7 @@ static const char * const alc_slave_vols[] = {
"Headphone Playback Volume", "Headphone Playback Volume",
"Speaker Playback Volume", "Speaker Playback Volume",
"Mono Playback Volume", "Mono Playback Volume",
"Line-Out Playback Volume", "Line Out Playback Volume",
"CLFE Playback Volume", "CLFE Playback Volume",
"Bass Speaker Playback Volume", "Bass Speaker Playback Volume",
"PCM Playback Volume", "PCM Playback Volume",
...@@ -1873,7 +1873,7 @@ static const char * const alc_slave_sws[] = { ...@@ -1873,7 +1873,7 @@ static const char * const alc_slave_sws[] = {
"Speaker Playback Switch", "Speaker Playback Switch",
"Mono Playback Switch", "Mono Playback Switch",
"IEC958 Playback Switch", "IEC958 Playback Switch",
"Line-Out Playback Switch", "Line Out Playback Switch",
"CLFE Playback Switch", "CLFE Playback Switch",
"Bass Speaker Playback Switch", "Bass Speaker Playback Switch",
"PCM Playback Switch", "PCM Playback Switch",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册