[Scummvm-cvs-logs] SF.net SVN: scummvm:[43619] scummvm/trunk/engines/scumm/he/sound_he.cpp
robinwatts at users.sourceforge.net
robinwatts at users.sourceforge.net
Sat Aug 22 00:48:54 CEST 2009
Revision: 43619
http://scummvm.svn.sourceforge.net/scummvm/?rev=43619&view=rev
Author: robinwatts
Date: 2009-08-21 22:48:54 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
Improved comments.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/he/sound_he.cpp
Modified: scummvm/trunk/engines/scumm/he/sound_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/sound_he.cpp 2009-08-21 22:44:49 UTC (rev 43618)
+++ scummvm/trunk/engines/scumm/he/sound_he.cpp 2009-08-21 22:48:54 UTC (rev 43619)
@@ -645,6 +645,10 @@
Audio::AudioStream *voxStream = Audio::makeADPCMStream(&stream, false, size, Audio::kADPCMMSIma, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign);
sound = (char *)malloc(size * 4);
+ /* On systems where it matters, malloc will return
+ * even addresses, so the use of (void *) in the
+ * following cast shuts the compiler from warning
+ * unnecessarily. */
size = voxStream->readBuffer((int16*)(void *)sound, size * 2);
size *= 2; // 16bits.
delete voxStream;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list