aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/directsound
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Output/directsound')
-rw-r--r--src/plugins/Output/directsound/outputdirectsound.cpp8
-rw-r--r--src/plugins/Output/directsound/outputdirectsound.h2
2 files changed, 5 insertions, 5 deletions
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();