diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2015-03-31 14:38:04 +0200 |
|---|---|---|
| committer | David Henningsson <david.henningsson@canonical.com> | 2015-04-10 16:08:24 +0200 |
| commit | 6db74fc3c7e2875d3f93dcf346ccd654a0e972aa (patch) | |
| tree | 46fca849b3e9cef5cfbd83370ed6e75e118b95c8 /src | |
| parent | 02dc6d84edde7af86e155b224b6aa98080ef2979 (diff) | |
alsa-mixer: Add paths/ports for multichannel profile
This makes the GUIs (e g gnome/unity-control-center) look more consistent
with other inputs/outputs that also have ports.
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/alsa/alsa-mixer.c | 4 | ||||
| -rw-r--r-- | src/modules/alsa/mixer/profile-sets/default.conf | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index 3832327b6..2314612d4 100644 --- a/src/modules/alsa/alsa-mixer.c +++ b/src/modules/alsa/alsa-mixer.c @@ -2389,7 +2389,9 @@ static int path_verify(pa_alsa_path *p) { { "hdmi-output", N_("HDMI / DisplayPort") }, { "iec958-stereo-output", N_("Digital Output (S/PDIF)") }, { "iec958-stereo-input", N_("Digital Input (S/PDIF)") }, - { "iec958-passthrough-output", N_("Digital Passthrough (S/PDIF)") } + { "iec958-passthrough-output", N_("Digital Passthrough (S/PDIF)") }, + { "multichannel-input", N_("Multichannel Input") }, + { "multichannel-output", N_("Multichannel Output") }, }; pa_alsa_element *e; diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf index 25c1960d3..470eb994c 100644 --- a/src/modules/alsa/mixer/profile-sets/default.conf +++ b/src/modules/alsa/mixer/profile-sets/default.conf @@ -449,6 +449,7 @@ exact-channels = false fallback = yes priority = 1 direction = output +paths-output = multichannel-output [Mapping multichannel-input] device-strings = hw:%f @@ -457,6 +458,7 @@ exact-channels = false fallback = yes priority = 1 direction = input +paths-input = multichannel-input ; An example for defining multiple-sink profiles #[Profile output:analog-stereo+output:iec958-stereo+input:analog-stereo] |