diff options
author | James Brown | 2002-04-22 11:36:41 +0000 |
---|---|---|
committer | James Brown | 2002-04-22 11:36:41 +0000 |
commit | a2217e35ff440f1d24c1cbd673f8f77b0d9a2663 (patch) | |
tree | ff9ee51b93b3ff3054f6833c661c5f206767a2d9 /sound | |
parent | c74f9669916bd9da16b78c01b739da8d478e5eff (diff) | |
download | scummvm-rg350-a2217e35ff440f1d24c1cbd673f8f77b0d9a2663.tar.gz scummvm-rg350-a2217e35ff440f1d24c1cbd673f8f77b0d9a2663.tar.bz2 scummvm-rg350-a2217e35ff440f1d24c1cbd673f8f77b0d9a2663.zip |
Fix MP3 compilation.
svn-id: r4050
Diffstat (limited to 'sound')
-rw-r--r-- | sound/mixer.cpp | 4 | ||||
-rw-r--r-- | sound/mixer.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index f27910d17d..5961a4f02a 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -61,8 +61,8 @@ int SoundMixer::play_raw(PlayingSoundHandle *handle, void *sound, uint32 size, u } #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)); +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) { if (*handle) diff --git a/sound/mixer.h b/sound/mixer.h index cf8d21f22f..d71638b37b 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -126,7 +126,7 @@ public: }; 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); + 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 |