thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r3949
This commit is contained in:
Lionel Ulmer 2002-04-15 20:22:47 +00:00
parent 1bd4390117
commit dabc6a24e8
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mp3_cd.cpp
View file

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

4
scumm.h
View file

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

14
sound.cpp
View file

@ -187,10 +187,8 @@ void Scumm::startTalkSound(uint32 offset, uint32 b, int mode)
MP3OffsetTable *result = NULL, key; MP3OffsetTable *result = NULL, key;
key.org_offset = offset; key.org_offset = offset;
result = result = (MP3OffsetTable *) bsearch(&key, offset_table, num_sound_effects,
(MP3OffsetTable *) bsearch(&key, offset_table, num_sound_effects, sizeof(MP3OffsetTable), compar);
sizeof(MP3OffsetTable), compar);
if (result == NULL) { if (result == NULL) {
warning("startTalkSound: did not find sound at offset %d !", offset); warning("startTalkSound: did not find sound at offset %d !", offset);
@ -545,7 +543,7 @@ void *Scumm::openSfxFile()
cur = offset_table; cur = offset_table;
while (size > 0) { while (size > 0) {
cur[0].org_offset = get_int(file); 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].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].num_tags = get_int(file);
cur[0].compressed_size = get_int(file); cur[0].compressed_size = get_int(file);
size -= 4 * 4; size -= 4 * 4;
@ -584,5 +582,7 @@ void Scumm::playSfxSound(void *sound, uint32 size, uint rate)
_mixer->play_raw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE); _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);
}