fixed most output plugins

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4538 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/Output/jack/outputjack.cpp b/src/plugins/Output/jack/outputjack.cpp
index 6adf9a907..192d42d61 100644
--- a/src/plugins/Output/jack/outputjack.cpp
+++ b/src/plugins/Output/jack/outputjack.cpp
@@ -47,7 +47,7 @@ OutputJACK::~OutputJACK()
     uninitialize();
 }
 
-bool OutputJACK::initialize(quint32 freq, int chan, Qmmp::AudioFormat format)
+bool OutputJACK::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format)
 {
     qDebug("OutputJACK: initialize");
     int bits = 0;
@@ -64,13 +64,13 @@ bool OutputJACK::initialize(quint32 freq, int chan, Qmmp::AudioFormat format)
     }
 
 
-    if(JACK_Open(&jack_device, bits, (unsigned long *)&freq, chan))
+    if(JACK_Open(&jack_device, bits, (unsigned long *)&freq, map.count()))
     {
         m_inited = false;
         return false;
     }
     m_inited = true;
-    configure(freq, chan, input_format);
+    configure(freq, map, input_format);
     return true;
 }
 
diff --git a/src/plugins/Output/jack/outputjack.h b/src/plugins/Output/jack/outputjack.h
index 7670ec291..50d61faa6 100644
--- a/src/plugins/Output/jack/outputjack.h
+++ b/src/plugins/Output/jack/outputjack.h
@@ -38,7 +38,7 @@ public:
     OutputJACK();
     ~OutputJACK();
 
-    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);