aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/pulseaudio
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Output/pulseaudio')
-rw-r--r--src/plugins/Output/pulseaudio/outputpulseaudio.cpp6
-rw-r--r--src/plugins/Output/pulseaudio/outputpulseaudio.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
index 65a23cd7c..70bf26dd7 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
@@ -33,7 +33,7 @@ OutputPulseAudio::~OutputPulseAudio()
uninitialize();
}
-bool OutputPulseAudio::initialize(quint32 freq, int chan, Qmmp::AudioFormat format)
+bool OutputPulseAudio::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format)
{
pa_sample_spec ss;
@@ -55,7 +55,7 @@ bool OutputPulseAudio::initialize(quint32 freq, int chan, Qmmp::AudioFormat form
ss.format = PA_SAMPLE_S16LE;
}
- ss.channels = chan;
+ ss.channels = map.count();
ss.rate = freq;
int error;
m_connection = pa_simple_new(NULL, // Use the default server.
@@ -73,7 +73,7 @@ bool OutputPulseAudio::initialize(quint32 freq, int chan, Qmmp::AudioFormat form
qWarning("OutputPulseAudio: pa_simple_new() failed: %s", pa_strerror(error));
return false;
}
- Output::configure(freq, chan, format);
+ Output::configure(freq, map, format);
return true;
}
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.h b/src/plugins/Output/pulseaudio/outputpulseaudio.h
index 3e6c18ab6..2a8064988 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.h
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.h
@@ -36,7 +36,7 @@ public:
OutputPulseAudio();
~OutputPulseAudio();
- 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);