[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.48,1.49
Ruediger Hanke
tomjoad at users.sourceforge.net
Sun Aug 11 04:57:01 CEST 2002
Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv26538
Modified Files:
mixer.cpp
Log Message:
Removing some system ifdef's that won't be required anymore soon
Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- mixer.cpp 10 Aug 2002 13:59:40 -0000 1.48
+++ mixer.cpp 11 Aug 2002 11:56:06 -0000 1.49
@@ -646,11 +646,6 @@
memcpy(_end_of_data, data, len);
}
_end_of_data = new_end;
-
-#ifdef __MORPHOS__
- if (_to_be_destroyed)
- _to_be_destroyed = false;
-#endif
}
void SoundMixer::Channel_STREAM::mix(int16 *data, uint len)
@@ -686,9 +681,6 @@
//warning("Streaming underflow of %d bytes", len);
//real_destroy();
//return;
-#ifdef __MORPHOS__
- _to_be_destroyed = true;
-#endif
}
_fp_pos = fp_pos;
}
More information about the Scummvm-git-logs
mailing list