[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.46,1.47
Ruediger Hanke
tomjoad at users.sourceforge.net
Fri Aug 9 06:36:05 CEST 2002
Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv23140
Modified Files:
mixer.cpp
Log Message:
Got rid of annoying blips and scratches on my system. It's just for MorphOS not to annoy Ender (see his comment in the source). Happens probably only here.
Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- mixer.cpp 9 Aug 2002 11:23:14 -0000 1.46
+++ mixer.cpp 9 Aug 2002 13:35:01 -0000 1.47
@@ -646,6 +646,11 @@
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)
@@ -681,6 +686,9 @@
//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