Fixed the MP3 support for .SOU files. I will let Arisme fix his MP3 audio track support :-)

svn-id: r3949

mp3_cd.cpp

@@ -21,7 +21,7 @@
 #include "stdafx.h"
 #include "scumm.h"
 
-#ifdef COMPRESSED_SOUND_FILE
+#ifdef COMPRESSED_SOUND_FILE__
 #include "mp3_cd.h"
 #include <SDL.h>
 

scumm.h

@@ -23,10 +23,6 @@
 #include "system.h"
 #include "mixer.h"
 
-#ifdef COMPRESSED_SOUND_FILE
-#include <mad.h>
-#endif
-
 #define SCUMMVM_VERSION "0.2.0 devel"
 #define SCUMMVM_CVS "031402"
 

sound.cpp

@@ -187,11 +187,9 @@ void Scumm::startTalkSound(uint32 offset, uint32 b, int mode)
 		MP3OffsetTable *result = NULL, key;
 
 		key.org_offset = offset;
-		result =
-			(MP3OffsetTable *) bsearch(&key, offset_table, num_sound_effects,
+		result = (MP3OffsetTable *) bsearch(&key, offset_table, num_sound_effects,
 		                                    sizeof(MP3OffsetTable), compar);
 
-
 		if (result == NULL) {
 			warning("startTalkSound: did not find sound at offset %d !", offset);
 			return;
@@ -584,5 +582,7 @@ void Scumm::playSfxSound(void *sound, uint32 size, uint rate)
 	_mixer->play_raw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE);
 }
 
-
-
+void Scumm::playSfxSound_MP3(void *sound, uint32 size)
+{
+	_mixer->play_mp3(NULL, sound, size, SoundMixer::FLAG_AUTOFREE);
+}