Re: [alsa-devel] [PATCH 2/2] ALSA: Integrate control based jack reporting with core jack reporting
So, a question of "Line Out" to be hyphened or not to be hyphened.
The problem is less serious than Hamlet, and I think we can get rid of the redundant hyphen. Not only because many women dislike hyphened names nowadays (as you can find easily in Google), the naming rule with a direction suffix looks more flexible, and I saw that both or Mark and David don't matter much (so written in their posts).
The fix patch is below. David, if you think it's too bad (that makes your code too messy), please speak up. Or, this is utterly broken, also let me know.
thanks,
Takashi
--- From: Takashi Iwai tiwai@suse.de Subject: [PATCH] ALSA: hda/realtek - Kill hyphnated names
Kill hyphens from "Line-Out" name strings, as suggested by Mark Brown.
Signed-off-by: Takashi Iwai tiwai@suse.de --- sound/pci/hda/hda_codec.c | 4 ++-- sound/pci/hda/patch_realtek.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 0ae6eb2..6843073 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -5118,7 +5118,7 @@ static int fill_audio_out_name(struct hda_codec *codec, hda_nid_t nid, const char *pfx = "", *sfx = "";
/* 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"; /* check the location */ switch (attr) { @@ -5177,7 +5177,7 @@ int snd_hda_get_pin_label(struct hda_codec *codec, hda_nid_t nid,
switch (get_defcfg_device(def_conf)) { 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); case AC_JACK_SPEAKER: return fill_audio_out_name(codec, nid, cfg, "Speaker", diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 4fe2d59..a5be866 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -1856,7 +1856,7 @@ static const char * const alc_slave_vols[] = { "Headphone Playback Volume", "Speaker Playback Volume", "Mono Playback Volume", - "Line-Out Playback Volume", + "Line Out Playback Volume", "CLFE Playback Volume", "Bass Speaker Playback Volume", "PCM Playback Volume", @@ -1873,7 +1873,7 @@ static const char * const alc_slave_sws[] = { "Speaker Playback Switch", "Mono Playback Switch", "IEC958 Playback Switch", - "Line-Out Playback Switch", + "Line Out Playback Switch", "CLFE Playback Switch", "Bass Speaker Playback Switch", "PCM Playback Switch",
On 03/01/2012 06:48 PM, Takashi Iwai wrote:
So, a question of "Line Out" to be hyphened or not to be hyphened.
The problem is less serious than Hamlet, and I think we can get rid of the redundant hyphen. Not only because many women dislike hyphened names nowadays (as you can find easily in Google),
Yes, it is also inspired by the global individualism movement, clearly 'Line' and 'Out' do not want to appear to be dependent on each other.
the naming rule with a direction suffix looks more flexible, and I saw that both or Mark and David don't matter much (so written in their posts).
The fix patch is below. David, if you think it's too bad (that makes your code too messy), please speak up. Or, this is utterly broken, also let me know.
There is no problem with this change. But is it used for mixer controls anywhere, or only jacks? So far I haven't seen a mixer control having either 'Line-Out' nor 'Line Out' in it.
A followup, slightly more serious question is 'Line' vs 'Line In'. It seems PulseAudio only supports 'Line' today, but adding support is trivial.
thanks,
Takashi
From: Takashi Iwaitiwai@suse.de Subject: [PATCH] ALSA: hda/realtek - Kill hyphnated names
Nitpick: Missing "e" in "hyphen".
Kill hyphens from "Line-Out" name strings, as suggested by Mark Brown.
Signed-off-by: Takashi Iwaitiwai@suse.de
sound/pci/hda/hda_codec.c | 4 ++-- sound/pci/hda/patch_realtek.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
I think you should change 'Line-Out' to 'Line Out' on a more global basis. A quick grep for 'Line-Out' shows hits (that are not comments) in patch_realtek.c, patch_cirrus.c and patch_conexant.c, as well as in ac97, aoa and parisc directories. At least the patch_cirrus one should be changed IMO.
Also, in the sound/soc there seem to be plenty of hits for 'Line Output' which could be changed to 'Line Out', mostly for consistency. Something for Mark?
At Fri, 02 Mar 2012 07:26:30 +0100, David Henningsson wrote:
On 03/01/2012 06:48 PM, Takashi Iwai wrote:
So, a question of "Line Out" to be hyphened or not to be hyphened.
The problem is less serious than Hamlet, and I think we can get rid of the redundant hyphen. Not only because many women dislike hyphened names nowadays (as you can find easily in Google),
Yes, it is also inspired by the global individualism movement, clearly 'Line' and 'Out' do not want to appear to be dependent on each other.
Yes, the modern time. "Line In" has a right to keep its name even after it being "Surround Out".
the naming rule with a direction suffix looks more flexible, and I saw that both or Mark and David don't matter much (so written in their posts).
The fix patch is below. David, if you think it's too bad (that makes your code too messy), please speak up. Or, this is utterly broken, also let me know.
There is no problem with this change. But is it used for mixer controls anywhere, or only jacks? So far I haven't seen a mixer control having either 'Line-Out' nor 'Line Out' in it.
Good point. I'll change it, too.
A followup, slightly more serious question is 'Line' vs 'Line In'. It seems PulseAudio only supports 'Line' today, but adding support is trivial.
It'd be safer if PA can support both. But I guess mixer controls will stay without "In" suffix. That is, when the directional suffix is omitted, it depends on the base type: the default for "Mic" is input, "Headphone" is output. And "Line" is input.
thanks,
Takashi
From: Takashi Iwaitiwai@suse.de Subject: [PATCH] ALSA: hda/realtek - Kill hyphnated names
Nitpick: Missing "e" in "hyphen".
Oops.
Kill hyphens from "Line-Out" name strings, as suggested by Mark Brown.
Signed-off-by: Takashi Iwaitiwai@suse.de
sound/pci/hda/hda_codec.c | 4 ++-- sound/pci/hda/patch_realtek.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
I think you should change 'Line-Out' to 'Line Out' on a more global basis. A quick grep for 'Line-Out' shows hits (that are not comments) in patch_realtek.c, patch_cirrus.c and patch_conexant.c, as well as in ac97, aoa and parisc directories. At least the patch_cirrus one should be changed IMO.
That makes sense.
Also, in the sound/soc there seem to be plenty of hits for 'Line Output' which could be changed to 'Line Out', mostly for consistency. Something for Mark?
I think we should standardize "Line Out" mixer control name at first, e.g. updating the outdated ControlNames.txt document. Anyway I'll leave ASoC part as is for now.
Takashi
On Fri, Mar 02, 2012 at 08:16:56AM +0100, Takashi Iwai wrote:
David Henningsson wrote:
Also, in the sound/soc there seem to be plenty of hits for 'Line Output' which could be changed to 'Line Out', mostly for consistency. Something for Mark?
I think we should standardize "Line Out" mixer control name at first, e.g. updating the outdated ControlNames.txt document. Anyway I'll leave ASoC part as is for now.
There's also a lot of LINEOUTn and so on. I've no intention of worrying about this stuff too much for ASoC, the name based routing is mostly nonsensical there anyway and it's very common for the thing connected to the line output to actually be another thing such as a speaker so acting on the fact that it's a line output might be actively wrong at the user level.
participants (3)
-
David Henningsson -
Mark Brown -
Takashi Iwai