[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.10,1.11 mixer.h,1.7,1.8

[James Brown]

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

Modified Files:
	mixer.cpp mixer.h 
Log Message:
Fix MP3 compilation.



Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mixer.cpp	22 Apr 2002 08:16:16 -0000	1.10
--- mixer.cpp	22 Apr 2002 11:36:41 -0000	1.11
***************
*** 62,67 ****
  
  #ifdef COMPRESSED_SOUND_FILE
! void SoundMixer::play_mp3(PlayingSoundHandle *handle, void *sound, uint32 size, byte flags) {
! 	insert(handle, new Channel_MP3(this, sound, size, flags));
  }
  void SoundMixer::play_mp3_cdtrack(PlayingSoundHandle *handle, FILE* file, void *buffer, uint32 buffer_size, mad_timer_t duration) {
--- 62,67 ----
  
  #ifdef COMPRESSED_SOUND_FILE
! int SoundMixer::play_mp3(PlayingSoundHandle *handle, void *sound, uint32 size, byte flags) {
! 	return insert(handle, new Channel_MP3(this, sound, size, flags));
  }
  void SoundMixer::play_mp3_cdtrack(PlayingSoundHandle *handle, FILE* file, void *buffer, uint32 buffer_size, mad_timer_t duration) {

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mixer.h	22 Apr 2002 08:16:16 -0000	1.7
--- mixer.h	22 Apr 2002 11:36:41 -0000	1.8
***************
*** 127,131 ****
  	int play_raw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags);
  #ifdef COMPRESSED_SOUND_FILE
! 	void play_mp3(PlayingSoundHandle *handle, void *sound, uint32 size, byte flags);
  	void play_mp3_cdtrack(PlayingSoundHandle *handle, FILE* file, void *buffer, uint32 buffer_size, mad_timer_t duration);
  #endif
--- 127,131 ----
  	int play_raw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags);
  #ifdef COMPRESSED_SOUND_FILE
! 	int play_mp3(PlayingSoundHandle *handle, void *sound, uint32 size, byte flags);
  	void play_mp3_cdtrack(PlayingSoundHandle *handle, FILE* file, void *buffer, uint32 buffer_size, mad_timer_t duration);
  #endif