From 76f436c36cdec74e73c12cea8d81051a7d75ec96 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Mon, 6 Oct 2014 07:50:56 +0000
Subject: added multichannel support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4530 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Output/alsa/outputalsa.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/plugins/Output/alsa/outputalsa.h')

diff --git a/src/plugins/Output/alsa/outputalsa.h b/src/plugins/Output/alsa/outputalsa.h
index 1600e3b29..d378b813c 100644
--- a/src/plugins/Output/alsa/outputalsa.h
+++ b/src/plugins/Output/alsa/outputalsa.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef   OUTPUTALSA_H
-#define   OUTPUTALSA_H
+#ifndef OUTPUTALSA_H
+#define OUTPUTALSA_H
 
 class OutputALSA;
 
@@ -28,6 +28,7 @@ extern "C"
 #include <alsa/asoundlib.h>
 }
 
+#include <QHash>
 #include <qmmp/output.h>
 #include <qmmp/volume.h>
 
@@ -38,7 +39,7 @@ public:
     OutputALSA();
     ~OutputALSA();
 
-    bool initialize(quint32, int, Qmmp::AudioFormat format);
+    bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format);
     //output api
     qint64 latency();
     qint64 writeAudio(unsigned char *data, qint64 maxSize);
@@ -63,6 +64,8 @@ private:
     qint64 m_prebuf_size;
     qint64 m_prebuf_fill;
     bool m_can_pause;
+    //channel conversions
+    QHash <quint16, Qmmp::ChannelPosition> m_alsa_channels;
 };
 
 class VolumeALSA : public Volume
-- 
cgit v1.2.3-13-gbd6f