diff options
| author | Max Horn | 2003-07-29 01:43:35 +0000 |
|---|---|---|
| committer | Max Horn | 2003-07-29 01:43:35 +0000 |
| commit | bb35528f43793042473602d1b3fb28e732c8bd0f (patch) | |
| tree | 6364ea780f42666f248ae7b43ba37211261afa67 /sound | |
| parent | 021a70182799d4cf8e3ee23a0530ebb8a7eacc7f (diff) | |
| download | scummvm-rg350-bb35528f43793042473602d1b3fb28e732c8bd0f.tar.gz scummvm-rg350-bb35528f43793042473602d1b3fb28e732c8bd0f.tar.bz2 scummvm-rg350-bb35528f43793042473602d1b3fb28e732c8bd0f.zip | |
return immediately after commiting suicide; enable new rate conversion code
svn-id: r9273
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mixer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index e36a54e087..c983f914c2 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -26,7 +26,7 @@ #include "common/file.h" #include "common/util.h" -//#define SOX_HACK +#define SOX_HACK #ifdef SOX_HACK #include "rate.h" @@ -726,6 +726,7 @@ void ChannelRaw::mix(int16 *data, uint len) { // TODO: call drain method // TODO: Looping destroy(); + return; } const int volume = _mixer->getVolume(); @@ -1183,6 +1184,7 @@ void ChannelVorbis::mix(int16 *data, uint len) { if (_input->eof() && !_is_cd_track) { // TODO: call drain method destroy(); + return; } const int volume = _mixer->getVolume(); |