diff options
| author | James Brown | 2002-10-28 12:56:42 +0000 |
|---|---|---|
| committer | James Brown | 2002-10-28 12:56:42 +0000 |
| commit | 63ee97b1ee6af5db94603b4971329c8f34346f39 (patch) | |
| tree | 166de04aed932a3e7000d39db86aea782e27a12c /sound/mixer.cpp | |
| parent | 0e0701ade40f3e61a4e4d7a2bc2db4f62e709819 (diff) | |
| download | scummvm-rg350-63ee97b1ee6af5db94603b4971329c8f34346f39.tar.gz scummvm-rg350-63ee97b1ee6af5db94603b4971329c8f34346f39.tar.bz2 scummvm-rg350-63ee97b1ee6af5db94603b4971329c8f34346f39.zip | |
Fix using MAD -without- Vorbis, and remove COMPRESSED_SOUND_FILE define.
Please keep in mind that if you put an 'else' statement in an if clause, keep in mind that if the code it's supposed to
'else' is in another define.... and that isn't set... the NEXT statement of code will be used as the 'if..else'
condition.
svn-id: r5344
Diffstat (limited to 'sound/mixer.cpp')
| -rw-r--r-- | sound/mixer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 6faaf22c67..e176e93431 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -262,12 +262,10 @@ void SoundMixer::setMusicVolume(int volume) { _musicVolume = volume; } -#ifdef COMPRESSED_SOUND_FILE bool SoundMixer::Channel::soundFinished() { warning("sound_finished should never be called on a non-MP3 mixer "); return false; } -#endif void SoundMixer::Channel::append(void * sound, uint32 size) { error("append method should never be called on something else than a _STREAM mixer "); |