[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.89,1.90
Max Horn
fingolfin at users.sourceforge.net
Thu Jul 31 14:02:06 CEST 2003
Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv31634
Modified Files:
mixer.cpp
Log Message:
get rid of BUGGY_NEW_MP3_PLAYER
Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- mixer.cpp 31 Jul 2003 20:24:10 -0000 1.89
+++ mixer.cpp 31 Jul 2003 20:28:11 -0000 1.90
@@ -144,7 +144,7 @@
bool isMusicChannel() { return false; }
};
-#ifdef BUGGY_NEW_MP3_PLAYER
+#ifdef SOX_HACK
class ChannelMP3CDMusic : public Channel {
RateConverter *_converter;
MP3InputStream *_input;
@@ -980,7 +980,7 @@
#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 @@
#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);
More information about the Scummvm-git-logs
mailing list