diff options
author | Jamieson Christian | 2003-07-30 09:26:54 +0000 |
---|---|---|
committer | Jamieson Christian | 2003-07-30 09:26:54 +0000 |
commit | 20d06e2c3dc09085c218620e61c384dc0514fabf (patch) | |
tree | 76796f189690aed1691a4c64369a7c53113fe372 /sound/mixer.cpp | |
parent | 7fbd161cadcd069aecd9d7bb881b76191b431172 (diff) | |
download | scummvm-rg350-20d06e2c3dc09085c218620e61c384dc0514fabf.tar.gz scummvm-rg350-20d06e2c3dc09085c218620e61c384dc0514fabf.tar.bz2 scummvm-rg350-20d06e2c3dc09085c218620e61c384dc0514fabf.zip |
Fixed MSVC errors
svn-id: r9288
Diffstat (limited to 'sound/mixer.cpp')
-rw-r--r-- | sound/mixer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index d9245e4eaf..3af9c1f4ed 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -677,7 +677,7 @@ ChannelRaw::ChannelRaw(SoundMixer *mixer, PlayingSoundHandle *handle, void *soun // TODO: add support for SoundMixer::FLAG_REVERSE_STEREO // Get a rate converter instance - _converter = makeRateConverter(rate, mixer->getOutputRate(), flags & SoundMixer::FLAG_STEREO); + _converter = makeRateConverter(rate, mixer->getOutputRate(), flags & SoundMixer::FLAG_STEREO != 0); #else _pos = 0; _fpPos = 0; @@ -725,7 +725,7 @@ void ChannelRaw::mix(int16 *data, uint len) { const int volume = _mixer->getVolume(); uint tmpLen = len; - _converter->flow(*_input, data, &tmpLen, volume); + _converter->flow(*_input, data, (st_size_t *) &tmpLen, volume); #else byte *s, *end; @@ -768,7 +768,7 @@ ChannelStream::ChannelStream(SoundMixer *mixer, PlayingSoundHandle *handle, void // TODO: add support for SoundMixer::FLAG_REVERSE_STEREO // Get a rate converter instance - _converter = makeRateConverter(rate, mixer->getOutputRate(), flags & SoundMixer::FLAG_STEREO); + _converter = makeRateConverter(rate, mixer->getOutputRate(), flags & SoundMixer::FLAG_STEREO != 0); #else _flags = flags; _bufferSize = buffer_size; @@ -846,7 +846,7 @@ void ChannelStream::mix(int16 *data, uint len) { const int volume = _mixer->getVolume(); uint tmpLen = len; - _converter->flow(*_input, data, &tmpLen, volume); + _converter->flow(*_input, data, (st_size_t *) &tmpLen, volume); #else if (_pos == _endOfData) { // Normally, the stream stays around even if all its data is used up. |