diff options
| author | Max Horn | 2003-07-31 20:28:11 +0000 |
|---|---|---|
| committer | Max Horn | 2003-07-31 20:28:11 +0000 |
| commit | 643e88b04c8acb2fb6cd7fed4749ecc520b2cd7d (patch) | |
| tree | c99ef1b0428e7241c60df250a5f5a9662fb87189 /sound | |
| parent | 0b4e48b59e18865ddd7785594def2aba872a0258 (diff) | |
| download | scummvm-rg350-643e88b04c8acb2fb6cd7fed4749ecc520b2cd7d.tar.gz scummvm-rg350-643e88b04c8acb2fb6cd7fed4749ecc520b2cd7d.tar.bz2 scummvm-rg350-643e88b04c8acb2fb6cd7fed4749ecc520b2cd7d.zip | |
get rid of BUGGY_NEW_MP3_PLAYER
svn-id: r9347
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mixer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 326106f6af..aa297896a6 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -144,7 +144,7 @@ public: bool isMusicChannel() { return false; } }; -#ifdef BUGGY_NEW_MP3_PLAYER +#ifdef SOX_HACK class ChannelMP3CDMusic : public Channel { RateConverter *_converter; MP3InputStream *_input; @@ -980,7 +980,7 @@ void ChannelMP3::mix(int16 *data, uint len) { #define MP3CD_BUFFERING_SIZE 131072 -#ifdef BUGGY_NEW_MP3_PLAYER +#ifdef SOX_HACK ChannelMP3CDMusic::ChannelMP3CDMusic(SoundMixer *mixer, PlayingSoundHandle *handle, File *file, mad_timer_t duration) : Channel(mixer, handle) { // Create the input stream @@ -1001,14 +1001,14 @@ ChannelMP3CDMusic::ChannelMP3CDMusic(SoundMixer *mixer, PlayingSoundHandle *hand #endif ChannelMP3CDMusic::~ChannelMP3CDMusic() { -#ifdef BUGGY_NEW_MP3_PLAYER +#ifdef SOX_HACK delete _converter; delete _input; #endif } void ChannelMP3CDMusic::mix(int16 *data, uint len) { -#ifdef BUGGY_NEW_MP3_PLAYER +#ifdef SOX_HACK assert(_input); assert(_converter); |