diff options
Diffstat (limited to 'src/plugins/Output/waveout')
| -rw-r--r-- | src/plugins/Output/waveout/outputwaveout.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/Output/waveout/outputwaveout.h | 4 |
2 files changed, 5 insertions, 5 deletions
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();
|