From 63ee97b1ee6af5db94603b4971329c8f34346f39 Mon Sep 17 00:00:00 2001
From: James Brown
Date: Mon, 28 Oct 2002 12:56:42 +0000
Subject: 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
---
 sound/mixer.cpp | 2 --
 sound/mixer.h   | 2 --
 2 files changed, 4 deletions(-)

(limited to 'sound')

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 ");
diff --git a/sound/mixer.h b/sound/mixer.h
index be763c2228..14897b5834 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -52,9 +52,7 @@ private:
 		}
 		virtual void realDestroy() = 0;
 		virtual void append(void *sound, uint32 size);
-#ifdef COMPRESSED_SOUND_FILE
 		virtual bool soundFinished();
-#endif
 	};
 
 	class ChannelRaw : public Channel {
-- 
cgit v1.2.3