From 96e2c239c4bc2a6f91d3fb141551eac06187b076 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 3 Jan 2004 00:55:28 +0000 Subject: removed SoundMixer::playMP3CDTrack; simplified makeMP3Stream (special variant with mad_timer_t was really only needed for MP3TrackInfo class) svn-id: r12095 --- sound/mixer.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'sound/mixer.h') 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 -#endif #ifdef USE_VORBIS #include #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); -- cgit v1.2.3