From c079fc76a1ccaf305b155c68757d3d345312e67f Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 6 Oct 2014 09:27:24 +0000 Subject: fixed most output plugins git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4538 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Output/oss/outputoss.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/plugins/Output/oss/outputoss.cpp') diff --git a/src/plugins/Output/oss/outputoss.cpp b/src/plugins/Output/oss/outputoss.cpp index c62a798c6..2d02967f3 100644 --- a/src/plugins/Output/oss/outputoss.cpp +++ b/src/plugins/Output/oss/outputoss.cpp @@ -70,7 +70,7 @@ void OutputOSS::sync() ioctl(m_audio_fd, SNDCTL_DSP_SYNC, 0); } -bool OutputOSS::initialize(quint32 freq, int chan, Qmmp::AudioFormat format) +bool OutputOSS::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format) { m_audio_fd = open(m_audio_device.toAscii(), O_WRONLY); @@ -83,6 +83,7 @@ bool OutputOSS::initialize(quint32 freq, int chan, Qmmp::AudioFormat format) ioctl(m_audio_fd, SNDCTL_DSP_RESET, 0); int p; + int chan = map.count(); switch (format) { case Qmmp::PCM_S16LE: @@ -121,7 +122,7 @@ bool OutputOSS::initialize(quint32 freq, int chan, Qmmp::AudioFormat format) ioctl(m_audio_fd, SNDCTL_DSP_RESET, 0); - configure(freq, chan, format); + configure(freq, map, format); return true; } -- cgit v1.2.3-13-gbd6f