diff options
| author | Max Horn | 2004-01-03 00:55:28 +0000 |
|---|---|---|
| committer | Max Horn | 2004-01-03 00:55:28 +0000 |
| commit | 96e2c239c4bc2a6f91d3fb141551eac06187b076 (patch) | |
| tree | f0eb601971c033f05ec36d1dbe3f14b7e28e6c4a /sound/mixer.h | |
| parent | d335bce62df47217546639b8816f8203f0137d37 (diff) | |
| download | scummvm-rg350-96e2c239c4bc2a6f91d3fb141551eac06187b076.tar.gz scummvm-rg350-96e2c239c4bc2a6f91d3fb141551eac06187b076.tar.bz2 scummvm-rg350-96e2c239c4bc2a6f91d3fb141551eac06187b076.zip | |
removed SoundMixer::playMP3CDTrack; simplified makeMP3Stream (special variant with mad_timer_t was really only needed for MP3TrackInfo class)
svn-id: r12095
Diffstat (limited to 'sound/mixer.h')
| -rw-r--r-- | sound/mixer.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index 372bad4fc0..67c82f7364 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -27,9 +27,6 @@ #include "common/scummsys.h" #include "common/system.h" -#ifdef USE_MAD -#include <mad.h> -#endif #ifdef USE_VORBIS #include <vorbis/vorbisfile.h> #endif @@ -115,7 +112,6 @@ public: int id = -1, byte volume = 255, int8 pan = 0, uint32 loopStart = 0, uint32 loopEnd = 0); #ifdef USE_MAD void playMP3(PlayingSoundHandle *handle, File *file, uint32 size, byte volume = 255, int8 pan = 0, int id = -1); - void playMP3CDTrack(PlayingSoundHandle *handle, File *file, mad_timer_t duration, byte volume = 255, int8 pan = 0, int id = -1); #endif #ifdef USE_VORBIS void playVorbis(PlayingSoundHandle *handle, File *file, uint32 size, byte volume = 255, int8 pan = 0, int id = -1); |