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/directsound/outputdirectsound.cpp | 8 ++++---- src/plugins/Output/directsound/outputdirectsound.h | 2 +- src/plugins/Output/waveout/outputwaveout.cpp | 6 +++--- src/plugins/Output/waveout/outputwaveout.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/plugins/Output/directsound/outputdirectsound.cpp b/src/plugins/Output/directsound/outputdirectsound.cpp index d26d6ac57..f6b61165a 100644 --- a/src/plugins/Output/directsound/outputdirectsound.cpp +++ b/src/plugins/Output/directsound/outputdirectsound.cpp @@ -47,7 +47,7 @@ OutputDirectSound::~OutputDirectSound() uninitialize(); } -bool OutputDirectSound::initialize(quint32 freq, int chan, Qmmp::AudioFormat format) +bool OutputDirectSound::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format) { Q_UNUSED(format); DSBUFFERDESC bufferDesc; @@ -82,7 +82,7 @@ bool OutputDirectSound::initialize(quint32 freq, int chan, Qmmp::AudioFormat for WAVEFORMATEX wfex; ZeroMemory(&wfex, sizeof(WAVEFORMATEX)); wfex.wFormatTag = WAVE_FORMAT_PCM; - wfex.nChannels = chan; + wfex.nChannels = map.count(); wfex.nSamplesPerSec = freq; wfex.wBitsPerSample = 16; wfex.nBlockAlign = (wfex.wBitsPerSample / 8) * wfex.nChannels; @@ -102,7 +102,7 @@ bool OutputDirectSound::initialize(quint32 freq, int chan, Qmmp::AudioFormat for ZeroMemory(&wfex, sizeof(WAVEFORMATEX)); wfex.wFormatTag = WAVE_FORMAT_PCM; - wfex.nChannels = chan; + wfex.nChannels = map.count(); wfex.nSamplesPerSec = freq; wfex.wBitsPerSample = 16; wfex.nBlockAlign = (wfex.wBitsPerSample / 8) * wfex.nChannels; @@ -133,7 +133,7 @@ bool OutputDirectSound::initialize(quint32 freq, int chan, Qmmp::AudioFormat for m_dsBuffer->SetCurrentPosition(0); m_dsBuffer->Play(0,0,DSBPLAY_LOOPING); m_dsBufferAt = 0; - configure(freq, chan, Qmmp::PCM_S16LE); + configure(freq, map, Qmmp::PCM_S16LE); if(volumeControl) volumeControl->restore(); return true; diff --git a/src/plugins/Output/directsound/outputdirectsound.h b/src/plugins/Output/directsound/outputdirectsound.h index bae67efbe..4aa9741ac 100644 --- a/src/plugins/Output/directsound/outputdirectsound.h +++ b/src/plugins/Output/directsound/outputdirectsound.h @@ -39,7 +39,7 @@ public: OutputDirectSound(); ~OutputDirectSound(); - bool initialize(quint32, int, Qmmp::AudioFormat format); + bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format); //output api qint64 latency(); 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; } diff --git a/src/plugins/Output/waveout/outputwaveout.h b/src/plugins/Output/waveout/outputwaveout.h index b6f924787..688d4ed45 100644 --- a/src/plugins/Output/waveout/outputwaveout.h +++ b/src/plugins/Output/waveout/outputwaveout.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2013 by Ilya Kotov * + * Copyright (C) 2009-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -35,7 +35,7 @@ public: OutputWaveOut(); ~OutputWaveOut(); - bool initialize(quint32, int, Qmmp::AudioFormat format); + bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format); //output api qint64 latency(); -- cgit v1.2.3-13-gbd6f