diff options
author | Max Horn | 2003-08-02 19:09:52 +0000 |
---|---|---|
committer | Max Horn | 2003-08-02 19:09:52 +0000 |
commit | 7ec38f5f02ebd44332b34e059d209165fa68fa14 (patch) | |
tree | 5a7ae973eed9741c8693213eed423fe75ffe1c9f /sound/mixer.cpp | |
parent | 20ba0865117ed865bc92a0e1e633dfc10c431587 (diff) | |
download | scummvm-rg350-7ec38f5f02ebd44332b34e059d209165fa68fa14.tar.gz scummvm-rg350-7ec38f5f02ebd44332b34e059d209165fa68fa14.tar.bz2 scummvm-rg350-7ec38f5f02ebd44332b34e059d209165fa68fa14.zip |
some more tweaks
svn-id: r9424
Diffstat (limited to 'sound/mixer.cpp')
-rw-r--r-- | sound/mixer.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 69d4e0d5af..dbc87f01f7 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -716,8 +716,7 @@ void ChannelRaw::mix(int16 *data, uint len) { } const int volume = _mixer->getVolume(); - st_size_t tmpLen = len; - _converter->flow(*_input, data, &tmpLen, volume); + _converter->flow(*_input, data, len, volume); #else byte *s, *end; @@ -837,8 +836,7 @@ void ChannelStream::mix(int16 *data, uint len) { } const int volume = _mixer->getVolume(); - st_size_t tmpLen = len; - _converter->flow(*_input, data, &tmpLen, volume); + _converter->flow(*_input, data, len, volume); #else if (_pos == _endOfData) { // Normally, the stream stays around even if all its data is used up. @@ -960,8 +958,7 @@ void ChannelMP3::mix(int16 *data, uint len) { } const int volume = _mixer->getVolume(); - st_size_t tmpLen = len; - _converter->flow(*_input, data, &tmpLen, volume); + _converter->flow(*_input, data, len, volume); #else const int volume = _mixer->getVolume(); @@ -1044,8 +1041,7 @@ void ChannelMP3CDMusic::mix(int16 *data, uint len) { } const int volume = _mixer->getMusicVolume(); - st_size_t tmpLen = len; - _converter->flow(*_input, data, &tmpLen, volume); + _converter->flow(*_input, data, len, volume); #else mad_timer_t frame_duration; const int volume = _mixer->getMusicVolume(); @@ -1198,8 +1194,7 @@ void ChannelVorbis::mix(int16 *data, uint len) { } const int volume = isMusicChannel() ? _mixer->getMusicVolume() : _mixer->getVolume(); - st_size_t tmpLen = len; - _converter->flow(*_input, data, &tmpLen, volume); + _converter->flow(*_input, data, len, volume); #else if (_end_pos > 0 && ov_pcm_tell(_ov_file) >= _end_pos) { destroy(); |