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

1 files changed, 18 insertions, 0 deletions

diff --git a/src/pcm/PcmExport.hxx b/src/pcm/PcmExport.hxx
index 7265ca07d..aafa1cea0 100644
--- a/src/pcm/PcmExport.hxx
+++ b/src/pcm/PcmExport.hxx
@@ -34,6 +34,13 @@ template<typename T> struct ConstBuffer;
  */
 struct PcmExport {
 	/**
+	 * This buffer is used to reorder channels.
+	 *
+	 * @see #alsa_channel_order
+	 */
+	PcmBuffer order_buffer;
+
+	/**
 	 * The buffer is used to convert DSD samples to the
 	 * DoP format.
 	 *
@@ -61,6 +68,16 @@ struct PcmExport {
 	uint8_t channels;
 
 	/**
+	 * Convert the given buffer from FLAC channel order to ALSA
+	 * channel order using ToAlsaChannelOrder()?
+	 *
+	 * If this value is SampleFormat::UNDEFINED, then no channel
+	 * reordering is applied, otherwise this is the input sample
+	 * format.
+	 */
+	SampleFormat alsa_channel_order;
+
+	/**
 	 * Convert DSD to DSD-over-PCM (DoP)?  Input format must be
 	 * SampleFormat::DSD and output format must be
 	 * SampleFormat::S24_P32.
@@ -96,6 +113,7 @@ struct PcmExport {
 	 * @param channels the number of channels; ignored unless dop is set
 	 */
 	void Open(SampleFormat sample_format, unsigned channels,
+		  bool _alsa_channel_order,
 		  bool dop, bool shift8, bool pack, bool reverse_endian);
 
 	/**