MP3 CD tracks should now be working properly.

Ludde, maybe you should check if Simon is still working OK as now the
change of the sound playing handle is 'asynchronous' (ie if you call
'stop' on a sound, the handle will NOT be put to NULL right away, but
at the next 'mix' thread call). Maybe we should completely remove this
handle stuff and always use instead the index returned by the
'play_XXX' functions.

svn-id: r4101

1 files changed, 1 insertions, 3 deletions

diff --git a/scumm.h b/scumm.h
index 4e8c8d209b..421ff60225 100644
--- a/scumm.h
+++ b/scumm.h
@@ -972,7 +972,6 @@ public:
 #ifdef COMPRESSED_SOUND_FILE
 
 	#define CACHE_TRACKS 10
-	#define MP3_BUFFER_SIZE 200000
 
 	/* used for mp3 CD music */
 
@@ -981,8 +980,7 @@ public:
 	struct mad_header _mad_header[CACHE_TRACKS];
 	long _mp3_size[CACHE_TRACKS];
 	FILE* _mp3_tracks[CACHE_TRACKS];
-	void* _mp3_buffer;
-	PlayingSoundHandle _mp3_handle;
+	int _mp3_index;
 
 	int getCachedTrack(int track);
 	int playMP3CDTrack(int track, int num_loops, int start, int delay);