diff options
| author | Pierre-Louis Bossart <pierre-louis.bossart@intel.com> | 2010-07-12 12:24:22 -0500 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2010-07-13 23:33:45 +0100 |
| commit | fb405765d90d69b185dd5f3ae4bad642327e64e4 (patch) | |
| tree | 4317beea288aa379c6a47edc7ce7d6aa38a7cbe3 /src/modules | |
| parent | cb55b00ccd25d965b1222e74375aee05427a449b (diff) | |
alsa: fix mixer profiles, add passthrough config
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@intel.com>
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/alsa/alsa-mixer.c | 8 | ||||
| -rw-r--r-- | src/modules/alsa/mixer/profile-sets/default.conf | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index b2888a36..1033bbea 100644 --- a/src/modules/alsa/alsa-mixer.c +++ b/src/modules/alsa/alsa-mixer.c @@ -1783,7 +1783,9 @@ static int path_verify(pa_alsa_path *p) { { "analog-output-headphones", N_("Analog Headphones") }, { "analog-output-lfe-on-mono", N_("Analog Output (LFE)") }, { "analog-output-mono", N_("Analog Mono Output") }, - { "analog-output-speaker", N_("Analog Speakers") } + { "analog-output-speaker", N_("Analog Speakers") }, + { "iec958-stereo-output", N_("Digital Output (IEC958)") }, + { "iec958-passthrough-output", N_("Digital Passthrough (IEC958)") } }; pa_alsa_element *e; @@ -2806,7 +2808,7 @@ static int mapping_verify(pa_alsa_mapping *m, const pa_channel_map *bonus) { { "analog-surround-70", N_("Analog Surround 7.0") }, { "analog-surround-71", N_("Analog Surround 7.1") }, { "iec958-stereo", N_("Digital Stereo (IEC958)") }, - { "iec958-surround-40", N_("Digital Surround 4.0 (IEC958)") }, + { "iec958-passthrough", N_("Digital Passthrough (IEC958)") }, { "iec958-ac3-surround-40", N_("Digital Surround 4.0 (IEC958/AC3)") }, { "iec958-ac3-surround-51", N_("Digital Surround 5.1 (IEC958/AC3)") }, { "hdmi-stereo", N_("Digital Stereo (HDMI)") } @@ -2932,7 +2934,7 @@ static int profile_verify(pa_alsa_profile *p) { static const struct description_map well_known_descriptions[] = { { "output:analog-mono+input:analog-mono", N_("Analog Mono Duplex") }, { "output:analog-stereo+input:analog-stereo", N_("Analog Stereo Duplex") }, - { "output:iec958-stereo", N_("Digital Stereo Duplex (IEC958)") }, + { "output:iec958-stereo+input:iec958-stereo", N_("Digital Stereo Duplex (IEC958)") }, { "off", N_("Off") } }; diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf index 5d352f1c..f470d604 100644 --- a/src/modules/alsa/mixer/profile-sets/default.conf +++ b/src/modules/alsa/mixer/profile-sets/default.conf @@ -112,12 +112,16 @@ direction = output [Mapping iec958-stereo] device-strings = iec958:%f channel-map = left,right +paths-input = iec958-stereo-input +paths-output = iec958-stereo-output priority = 5 -[Mapping iec958-surround-40] +[Mapping iec958-passthrough] device-strings = iec958:%f -channel-map = front-left,front-right,rear-left,rear-right -priority = 1 +channel-map = left,right +direction = output +paths-output = iec958-passthrough-output +priority = 5 [Mapping iec958-ac3-surround-40] device-strings = a52:%f |