diff options
author | Max Kellermann <max@musicpd.org> | 2019-03-16 14:03:10 +0100 |
---|---|---|
committer | Max Kellermann <max@musicpd.org> | 2019-03-16 14:03:10 +0100 |
commit | 0bb71f1f20096811d3a49d1c7e58ba2c353ac62d (patch) | |
tree | 4306dff29cc39f4b58dcfc7e45b28abd064dd615 /src/output | |
parent | 1aa7cdd602ad7e7e2b2fe04a829a0d59c6c07f9a (diff) |
output/pulse: use pa_channel_map_init_extend() instead of _auto()
Unlike pa_channel_map_init_auto(), pa_channel_map_init_extend() does
not fail if there is no valid mapping for the given channel count, but
instead maps additional "AUX" channels.
Closes https://github.com/MusicPlayerDaemon/MPD/issues/493
Diffstat (limited to 'src/output')
-rw-r--r-- | src/output/plugins/PulseOutputPlugin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/output/plugins/PulseOutputPlugin.cxx b/src/output/plugins/PulseOutputPlugin.cxx index 59fe9fb54..fa1b06da9 100644 --- a/src/output/plugins/PulseOutputPlugin.cxx +++ b/src/output/plugins/PulseOutputPlugin.cxx @@ -581,8 +581,8 @@ PulseOutput::SetupStream(const pa_sample_spec &ss) /* WAVE-EX is been adopted as the speaker map for most media files */ pa_channel_map chan_map; - pa_channel_map_init_auto(&chan_map, ss.channels, - PA_CHANNEL_MAP_WAVEEX); + pa_channel_map_init_extend(&chan_map, ss.channels, + PA_CHANNEL_MAP_WAVEEX); stream = pa_stream_new(context, name, &ss, &chan_map); if (stream == nullptr) throw MakePulseError(context, |