[Scummvm-cvs-logs] CVS: scummvm scumm.h,1.118,1.119 sound.cpp,1.42,1.43 mp3_cd.cpp,1.8,1.9

[Lionel Ulmer]

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

Modified Files:
	scumm.h sound.cpp mp3_cd.cpp 
Log Message:
Fixed the MP3 support for .SOU files. I will let Arisme fix his MP3 audio track support :-)



Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** scumm.h	14 Apr 2002 18:13:07 -0000	1.118
--- scumm.h	15 Apr 2002 20:22:46 -0000	1.119
***************
*** 24,31 ****
  #include "mixer.h"
  
- #ifdef COMPRESSED_SOUND_FILE
- #include <mad.h>
- #endif
- 
  #define SCUMMVM_VERSION "0.2.0 devel"
  #define SCUMMVM_CVS "031402"
--- 24,27 ----

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** sound.cpp	15 Apr 2002 18:07:55 -0000	1.42
--- sound.cpp	15 Apr 2002 20:22:46 -0000	1.43
***************
*** 188,195 ****
  
  		key.org_offset = offset;
! 		result =
! 			(MP3OffsetTable *) bsearch(&key, offset_table, num_sound_effects,
! 																 sizeof(MP3OffsetTable), compar);
! 
  
  		if (result == NULL) {
--- 188,193 ----
  
  		key.org_offset = offset;
! 		result = (MP3OffsetTable *) bsearch(&key, offset_table, num_sound_effects,
! 		                                    sizeof(MP3OffsetTable), compar);
  
  		if (result == NULL) {
***************
*** 546,550 ****
  		while (size > 0) {
  			cur[0].org_offset = get_int(file);
! 			cur[0].new_offset = get_int(file) + compressed_offset + 4;	/* The + 4 is to take into accound the 'size' field */
  			cur[0].num_tags = get_int(file);
  			cur[0].compressed_size = get_int(file);
--- 544,548 ----
  		while (size > 0) {
  			cur[0].org_offset = get_int(file);
! 			cur[0].new_offset = get_int(file) + compressed_offset + 4; /* The + 4 is to take into accound the 'size' field */
  			cur[0].num_tags = get_int(file);
  			cur[0].compressed_size = get_int(file);
***************
*** 585,588 ****
  }
  
! 
! 
--- 583,588 ----
  }
  
! void Scumm::playSfxSound_MP3(void *sound, uint32 size)
! {
! 	_mixer->play_mp3(NULL, sound, size, SoundMixer::FLAG_AUTOFREE);
! }

Index: mp3_cd.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/mp3_cd.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mp3_cd.cpp	11 Apr 2002 17:19:14 -0000	1.8
--- mp3_cd.cpp	15 Apr 2002 20:22:47 -0000	1.9
***************
*** 22,26 ****
  #include "scumm.h"
  
! #ifdef COMPRESSED_SOUND_FILE
  #include "mp3_cd.h"
  #include <SDL.h>
--- 22,26 ----
  #include "scumm.h"
  
! #ifdef COMPRESSED_SOUND_FILE__
  #include "mp3_cd.h"
  #include <SDL.h>