* [PATCH] ALSA: Update control names documentation
@ 2014-10-20 12:38 David Henningsson
2014-10-20 13:38 ` Takashi Iwai
2014-10-20 23:46 ` Raymond Yau
0 siblings, 2 replies; 4+ messages in thread
From: David Henningsson @ 2014-10-20 12:38 UTC (permalink / raw)
To: alsa-devel; +Cc: tiwai, broonie, David Henningsson
This document was not really up-to-date. Add recent additions to this
standard - based on what the HDA driver currently does, which is some
kind of a de facto standard.
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
Documentation/sound/alsa/ControlNames.txt | 32 ++++++++++++++++++++++++++-----
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/Documentation/sound/alsa/ControlNames.txt b/Documentation/sound/alsa/ControlNames.txt
index fea65bb..79a6127 100644
--- a/Documentation/sound/alsa/ControlNames.txt
+++ b/Documentation/sound/alsa/ControlNames.txt
@@ -1,6 +1,6 @@
This document describes standard names of mixer controls.
-Syntax: SOURCE [DIRECTION] FUNCTION
+Syntax: [LOCATION] SOURCE [CHANNEL] [DIRECTION] FUNCTION
DIRECTION:
<nothing> (both directions)
@@ -14,12 +14,29 @@ FUNCTION:
Volume
Route (route control, hardware specific)
+CHANNEL:
+ <nothing> (channel independent, or applies to all channels)
+ Front
+ Surround (rear left/right in 4.0/5.1 surround)
+ CLFE
+ Center
+ LFE
+ Side (side left/right for 7.1 surround)
+
+LOCATION: (physical location of source)
+ Front
+ Rear
+ Dock (docking station)
+ Internal
+
SOURCE:
Master
Master Mono
Hardware Master
Speaker (internal speaker)
+ Bass Speaker (internal LFE speaker)
Headphone
+ Line Out
Beep (beep generator)
Phone
Phone Input
@@ -27,14 +44,14 @@ SOURCE:
Synth
FM
Mic
- Line
+ Headset Mic (mic part of combined headset jack - 4-pin headphone + mic)
+ Headphone Mic (mic part of either/or - 3-pin headphone or mic)
+ Line (input only, use "Line Out" for output)
CD
Video
Zoom Video
Aux
PCM
- PCM Front
- PCM Rear
PCM Pan
Loopback
Analog Loopback (D/A -> A/D loopback)
@@ -47,8 +64,13 @@ SOURCE:
Music
I2S
IEC958
+ HDMI
+ SPDIF (output only)
+ SPDIF In
+ Digital In
+ HDMI/DP (either HDMI or DisplayPort)
-Exceptions:
+Exceptions (deprecated):
[Digital] Capture Source
[Digital] Capture Switch (aka input gain switch)
[Digital] Capture Volume (aka input gain volume)
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ALSA: Update control names documentation
2014-10-20 12:38 [PATCH] ALSA: Update control names documentation David Henningsson
@ 2014-10-20 13:38 ` Takashi Iwai
2014-10-20 23:46 ` Raymond Yau
1 sibling, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2014-10-20 13:38 UTC (permalink / raw)
To: David Henningsson; +Cc: alsa-devel, broonie
At Mon, 20 Oct 2014 14:38:09 +0200,
David Henningsson wrote:
>
> This document was not really up-to-date. Add recent additions to this
> standard - based on what the HDA driver currently does, which is some
> kind of a de facto standard.
>
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Looks god to me as a start. Applied to for-next branch now.
thanks,
Takashi
> ---
> Documentation/sound/alsa/ControlNames.txt | 32 ++++++++++++++++++++++++++-----
> 1 file changed, 27 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/sound/alsa/ControlNames.txt b/Documentation/sound/alsa/ControlNames.txt
> index fea65bb..79a6127 100644
> --- a/Documentation/sound/alsa/ControlNames.txt
> +++ b/Documentation/sound/alsa/ControlNames.txt
> @@ -1,6 +1,6 @@
> This document describes standard names of mixer controls.
>
> -Syntax: SOURCE [DIRECTION] FUNCTION
> +Syntax: [LOCATION] SOURCE [CHANNEL] [DIRECTION] FUNCTION
>
> DIRECTION:
> <nothing> (both directions)
> @@ -14,12 +14,29 @@ FUNCTION:
> Volume
> Route (route control, hardware specific)
>
> +CHANNEL:
> + <nothing> (channel independent, or applies to all channels)
> + Front
> + Surround (rear left/right in 4.0/5.1 surround)
> + CLFE
> + Center
> + LFE
> + Side (side left/right for 7.1 surround)
> +
> +LOCATION: (physical location of source)
> + Front
> + Rear
> + Dock (docking station)
> + Internal
> +
> SOURCE:
> Master
> Master Mono
> Hardware Master
> Speaker (internal speaker)
> + Bass Speaker (internal LFE speaker)
> Headphone
> + Line Out
> Beep (beep generator)
> Phone
> Phone Input
> @@ -27,14 +44,14 @@ SOURCE:
> Synth
> FM
> Mic
> - Line
> + Headset Mic (mic part of combined headset jack - 4-pin headphone + mic)
> + Headphone Mic (mic part of either/or - 3-pin headphone or mic)
> + Line (input only, use "Line Out" for output)
> CD
> Video
> Zoom Video
> Aux
> PCM
> - PCM Front
> - PCM Rear
> PCM Pan
> Loopback
> Analog Loopback (D/A -> A/D loopback)
> @@ -47,8 +64,13 @@ SOURCE:
> Music
> I2S
> IEC958
> + HDMI
> + SPDIF (output only)
> + SPDIF In
> + Digital In
> + HDMI/DP (either HDMI or DisplayPort)
>
> -Exceptions:
> +Exceptions (deprecated):
> [Digital] Capture Source
> [Digital] Capture Switch (aka input gain switch)
> [Digital] Capture Volume (aka input gain volume)
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ALSA: Update control names documentation
2014-10-20 12:38 [PATCH] ALSA: Update control names documentation David Henningsson
2014-10-20 13:38 ` Takashi Iwai
@ 2014-10-20 23:46 ` Raymond Yau
2014-10-21 3:38 ` David Henningsson
1 sibling, 1 reply; 4+ messages in thread
From: Raymond Yau @ 2014-10-20 23:46 UTC (permalink / raw)
To: David Henningsson; +Cc: tiwai, alsa-devel, broonie
>
> This document was not really up-to-date. Add recent additions to this
> standard - based on what the HDA driver currently does, which is some
> kind of a de facto standard.
>
Is it feasible to remove "Hardware Master" if no alsa driver use this name ?
>
>
> diff --git a/Documentation/sound/alsa/ControlNames.txt
b/Documentation/sound/alsa/ControlNames.txt
> index fea65bb..79a6127 100644
> --- a/Documentation/sound/alsa/ControlNames.txt
> +++ b/Documentation/sound/alsa/ControlNames.txt
> @@ -1,6 +1,6 @@
> This document describes standard names of mixer controls.
>
> -Syntax: SOURCE [DIRECTION] FUNCTION
> +Syntax: [LOCATION] SOURCE [CHANNEL] [DIRECTION] FUNCTION
>
> Hardware Master
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ALSA: Update control names documentation
2014-10-20 23:46 ` Raymond Yau
@ 2014-10-21 3:38 ` David Henningsson
0 siblings, 0 replies; 4+ messages in thread
From: David Henningsson @ 2014-10-21 3:38 UTC (permalink / raw)
To: Raymond Yau; +Cc: tiwai, alsa-devel, broonie
On 2014-10-21 01:46, Raymond Yau wrote:
>
> >
> > This document was not really up-to-date. Add recent additions to this
> > standard - based on what the HDA driver currently does, which is some
> > kind of a de facto standard.
> >
>
> Is it feasible to remove "Hardware Master" if no alsa driver use this name ?
I believe so, it's kind of a bad name anyway. Feel free to send a patch.
--
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-10-21 3:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-20 12:38 [PATCH] ALSA: Update control names documentation David Henningsson
2014-10-20 13:38 ` Takashi Iwai
2014-10-20 23:46 ` Raymond Yau
2014-10-21 3:38 ` David Henningsson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.