From 3683a27d83873fe853bf7e849f8369950b4a0dfb Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 19 Jan 2010 13:06:19 +0000 Subject: fixed build git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1508 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Output/waveout/outputwaveout.cpp | 6 +++--- src/plugins/Output/waveout/outputwaveout.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/plugins/Output/waveout/outputwaveout.cpp b/src/plugins/Output/waveout/outputwaveout.cpp index 9966710fd..58f2ec5f5 100644 --- a/src/plugins/Output/waveout/outputwaveout.cpp +++ b/src/plugins/Output/waveout/outputwaveout.cpp @@ -94,13 +94,13 @@ OutputWaveOut::~OutputWaveOut() uninitialize(); } -void OutputWaveOut::configure(quint32 freq, int chan, int prec) +void OutputWaveOut::configure(quint32 freq, int chan, Qmmp::AudioFormat format) { WAVEFORMATEX fmt; UINT deviceID = WAVE_MAPPER; fmt.wFormatTag = WAVE_FORMAT_PCM; - fmt.wBitsPerSample = prec; + fmt.wBitsPerSample = 16; fmt.nChannels = chan; fmt.nSamplesPerSec = (unsigned long)(freq); fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample/8; @@ -128,7 +128,7 @@ void OutputWaveOut::configure(quint32 freq, int chan, int prec) waveOutReset (dev); InitializeCriticalSection ( &cs ); - Output::configure(freq, chan, prec); + Output::configure(freq, chan, format); return; } diff --git a/src/plugins/Output/waveout/outputwaveout.h b/src/plugins/Output/waveout/outputwaveout.h index a50e8a5e4..bbe711f66 100644 --- a/src/plugins/Output/waveout/outputwaveout.h +++ b/src/plugins/Output/waveout/outputwaveout.h @@ -37,12 +37,12 @@ public: ~OutputWaveOut(); bool initialize(); - void configure(quint32, int, int); + void configure(quint32, int, Qmmp::AudioFormat format); qint64 latency(); private: //output api - qint64 writeAudio(unsigned char *data, qint64 maxSize); + qint64 writeAudio(unsigned char *data, qint64 size); void flush(); // helper functions -- cgit v1.2.3-13-gbd6f