[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.23,1.24 mixer.h,1.12,1.13

[James Brown]

Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv8361/sound

Modified Files:
	mixer.cpp mixer.h 
Log Message:
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.




Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mixer.cpp	27 Oct 2002 19:32:36 -0000	1.23
+++ mixer.cpp	28 Oct 2002 12:56:42 -0000	1.24
@@ -262,12 +262,10 @@
 	_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 ");

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mixer.h	27 Oct 2002 11:41:08 -0000	1.12
+++ mixer.h	28 Oct 2002 12:56:42 -0000	1.13
@@ -52,9 +52,7 @@
 		}
 		virtual void realDestroy() = 0;
 		virtual void append(void *sound, uint32 size);
-#ifdef COMPRESSED_SOUND_FILE
 		virtual bool soundFinished();
-#endif
 	};
 
 	class ChannelRaw : public Channel {