aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-10-27 00:22:22 +0100
committerMax Kellermann <max@duempel.org>2015-10-27 11:44:23 +0100
commit15e432204e62dd5a1c873af13a679195b9645b0c (patch)
treea00687f4ac08b273a9416c36681749c42ed9dcbe /src/output
parent4b1630e1ec1fe5cbecc013a3e1487d9f43fcdd2f (diff)
downloadmpd-15e432204e62dd5a1c873af13a679195b9645b0c.tar.gz
mpd-15e432204e62dd5a1c873af13a679195b9645b0c.tar.xz
mpd-15e432204e62dd5a1c873af13a679195b9645b0c.zip
pcm/Order: new library to convert from FLAC to ALSA channel order
This new library is integrated in the PcmExport class and (if enabled) converts MPD's channel order (= FLAC channel order) to ALSA channel order. This fixes: http://bugs.musicpd.org/view.php?id=3147 and http://bugs.musicpd.org/view.php?id=3255
Diffstat (limited to 'src/output')
-rw-r--r--src/output/plugins/AlsaOutputPlugin.cxx2
-rw-r--r--src/output/plugins/OssOutputPlugin.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/output/plugins/AlsaOutputPlugin.cxx b/src/output/plugins/AlsaOutputPlugin.cxx
index 8a7bb9643..0bc5438f1 100644
--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -711,7 +711,7 @@ AlsaOutput::SetupOrDop(AudioFormat &audio_format, Error &error)
pcm_export->Open(audio_format.format,
audio_format.channels,
- dop2, shift8, packed, reverse_endian);
+ true, dop2, shift8, packed, reverse_endian);
return true;
}
diff --git a/src/output/plugins/OssOutputPlugin.cxx b/src/output/plugins/OssOutputPlugin.cxx
index 7f75f4e31..ba86dc079 100644
--- a/src/output/plugins/OssOutputPlugin.cxx
+++ b/src/output/plugins/OssOutputPlugin.cxx
@@ -537,7 +537,7 @@ oss_probe_sample_format(int fd, SampleFormat sample_format,
*oss_format_r = oss_format;
#ifdef AFMT_S24_PACKED
- pcm_export.Open(sample_format, 0, false, false,
+ pcm_export.Open(sample_format, 0, true, false, false,
oss_format == AFMT_S24_PACKED,
oss_format == AFMT_S24_PACKED &&
!IsLittleEndian());