libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-02 08:55:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

get rid of BUGGY_NEW_MP3_PLAYER

Browse Source 
svn-id: r9347
This commit is contained in:
Max Horn 2003-07-31 20:28:11 +00:00
parent 0b4e48b59e
commit 643e88b04c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/mixer.cpp
View File

@ -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);