From 275eddbde61bfea64385a6853dbca7f63b361d25 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 15 Oct 2014 06:16:00 +0000 Subject: fixed win32 build git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4578 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Output/waveout/outputwaveout.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/Output/waveout/outputwaveout.cpp') diff --git a/src/plugins/Output/waveout/outputwaveout.cpp b/src/plugins/Output/waveout/outputwaveout.cpp index 27504fa7f..6b26608b1 100644 --- a/src/plugins/Output/waveout/outputwaveout.cpp +++ b/src/plugins/Output/waveout/outputwaveout.cpp @@ -84,7 +84,7 @@ OutputWaveOut::~OutputWaveOut() uninitialize(); } -bool OutputWaveOut::initialize(quint32 freq, int chan, Qmmp::AudioFormat format) +bool OutputWaveOut::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format) { Q_UNUSED(format); if (!waveOutGetNumDevs ()) @@ -97,7 +97,7 @@ bool OutputWaveOut::initialize(quint32 freq, int chan, Qmmp::AudioFormat format) fmt.wFormatTag = WAVE_FORMAT_PCM; fmt.wBitsPerSample = 16; - fmt.nChannels = chan; + fmt.nChannels = map.count(); fmt.nSamplesPerSec = (unsigned long)(freq); fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample/8; fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nChannels * fmt.wBitsPerSample/8; @@ -131,7 +131,7 @@ bool OutputWaveOut::initialize(quint32 freq, int chan, Qmmp::AudioFormat format) waveOutReset (dev); InitializeCriticalSection (&cs); - configure(freq, chan, Qmmp::PCM_S16LE); + configure(freq, map, Qmmp::PCM_S16LE); return true; } -- cgit v1.2.3-13-gbd6f