[Scummvm-cvs-logs] SF.net SVN: scummvm:[48495] scummvm/trunk/sound/decoders/raw.cpp

[lordhoto at users.sourceforge.net]

Revision: 48495
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48495&view=rev
Author:   lordhoto
Date:     2010-04-03 15:56:40 +0000 (Sat, 03 Apr 2010)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/sound/decoders/raw.cpp

Modified: scummvm/trunk/sound/decoders/raw.cpp
===================================================================
--- scummvm/trunk/sound/decoders/raw.cpp	2010-04-03 15:16:52 UTC (rev 48494)
+++ scummvm/trunk/sound/decoders/raw.cpp	2010-04-03 15:56:40 UTC (rev 48495)
@@ -159,7 +159,7 @@
 			// If that is not the case, we should probably stop the
 			// stream playback.
 			_stream->seek(_filePos, SEEK_SET);
-			_stream->read(_buffer, readAmount * (is16Bit? 2: 1));
+			_stream->read(_buffer, readAmount * (is16Bit ? 2 : 1));
 
 			// Amount of data in buffer is now the amount read in, and
 			// the amount left to read on disk is decreased by the same amount
@@ -231,7 +231,7 @@
  * particular case it should actually help it :-)
  */
 
-#define MAKE_LINEAR_DISK(STEREO, UNSIGNED) \
+#define MAKE_RAW_STREAM(STEREO, UNSIGNED) \
 		if (is16Bit) { \
 			if (isLE) \
 				return new RawStream<STEREO, true, UNSIGNED, true>(rate, disposeAfterUse, stream, blockList); \
@@ -259,15 +259,15 @@
 
 	if (isStereo) {
 		if (isUnsigned) {
-			MAKE_LINEAR_DISK(true, true);
+			MAKE_RAW_STREAM(true, true);
 		} else {
-			MAKE_LINEAR_DISK(true, false);
+			MAKE_RAW_STREAM(true, false);
 		}
 	} else {
 		if (isUnsigned) {
-			MAKE_LINEAR_DISK(false, true);
+			MAKE_RAW_STREAM(false, true);
 		} else {
-			MAKE_LINEAR_DISK(false, false);
+			MAKE_RAW_STREAM(false, false);
 		}
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.