summaryrefslogtreecommitdiffstats
path: root/src/modules/alsa/mixer
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2010-12-20 12:29:27 +0100
committerColin Guthrie <cguthrie@mandriva.org>2011-02-25 15:48:11 +0000
commitb0f72311cf49e25ea05279e3a978bb4db54dd332 (patch)
tree47c3bf5ad3d407da249a59776ead0784ad099cc9 /src/modules/alsa/mixer
parent0ce3017b7407ab1c4094f7ce271bb68319a7eba7 (diff)
alsa-mixer: add required-any and required-* for enum options
Now you can add required-any to elements in a path and the path will be valid as long as at least one of the elements are present. Also you can have required, required-any and required-absent in element options, causing a path to be unsupported if an option is (not) present (simplified example: to skip line in path if "Capture source" doesn't have a "Line In" option). Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Diffstat (limited to 'src/modules/alsa/mixer')
-rw-r--r--src/modules/alsa/mixer/paths/analog-output.conf.common5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/modules/alsa/mixer/paths/analog-output.conf.common b/src/modules/alsa/mixer/paths/analog-output.conf.common
index 6131da5c..ffd1b413 100644
--- a/src/modules/alsa/mixer/paths/analog-output.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-output.conf.common
@@ -63,10 +63,15 @@
; # by the option name, resp. on/off if the element is a switch.
; name = ... # Logical name to use in the path identifier
; priority = ... # Priority if this is made into a device port
+; required = ignore | enumeration | any # In this element, this option must exist or the path will be invalid. ("any" is an alias for "enumeration".)
+; required-any = ignore | enumeration | any # In this element, either this or another option must exist (or an element)
+; required-absent = ignore | enumeration | any # In this element, this option must not exist or the path will be invalid
;
; [Element ...] # For each element that we shall control
; required = ignore | switch | volume | enumeration | any # If set, require this element to be of this kind and available,
; # otherwise don't consider this path valid for the card
+; required-any = ignore | switch | volume | enumeration | any # If set, at least one of the elements with required-any in this
+; # path must be present, otherwise this path is invalid for the card
; required-absent = ignore | switch | volume # If set, require this element to not be of this kind and not
; # available, otherwise don't consider this path valid for the card
;