alsa-mixer: Introduce "description-key" option for paths
authorTanu Kaskinen <tanuk@iki.fi>
Fri, 29 Jun 2012 15:04:57 +0000 (18:04 +0300)
committerArun Raghavan <arun.raghavan@collabora.co.uk>
Mon, 3 Jun 2013 19:08:39 +0000 (00:38 +0530)
commit3c1ca6d4b881863b41154b561591cf0a68230c16
tree25b1ebaa2a4a455e86aa8a89fb1369e02b273edc
parent66aeea7f72c5d4b978f8b5ed59987f7eed2a884a
alsa-mixer: Introduce "description-key" option for paths

Previously the path description was looked up based on the
path name only. Since there can be multiple paths that use
the same description, it had to be possible to have multiple
paths with the same name.

Having the same name with multiple paths makes identifying
the paths more complex than necessary, so the plan is to
make it impossible to have paths with the same name. This
patch prepares for that by retaining the possibility to
still have the same description with multiple paths. Instead
of the path name, the path description is looked up by using
the "path description key" if it is set (path name is still
used as a fallback lookup key).
20 files changed:
src/modules/alsa/alsa-mixer.c
src/modules/alsa/alsa-mixer.h
src/modules/alsa/mixer/paths/analog-input-aux.conf
src/modules/alsa/mixer/paths/analog-input-dock-mic.conf
src/modules/alsa/mixer/paths/analog-input-fm.conf
src/modules/alsa/mixer/paths/analog-input-front-mic.conf
src/modules/alsa/mixer/paths/analog-input-headphone-mic.conf
src/modules/alsa/mixer/paths/analog-input-headset-mic.conf
src/modules/alsa/mixer/paths/analog-input-internal-mic-always.conf
src/modules/alsa/mixer/paths/analog-input-internal-mic.conf
src/modules/alsa/mixer/paths/analog-input-mic-line.conf
src/modules/alsa/mixer/paths/analog-input-mic.conf
src/modules/alsa/mixer/paths/analog-input-rear-mic.conf
src/modules/alsa/mixer/paths/analog-input-tvtuner.conf
src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf
src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
src/modules/alsa/mixer/paths/analog-output-headphones.conf
src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
src/modules/alsa/mixer/paths/analog-output-speaker.conf
src/modules/alsa/mixer/paths/analog-output.conf.common