[Scummvm-cvs-logs] CVS: scummvm/sound audiostream.h,1.43,1.44 audiostream.cpp,1.70,1.71

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv486

Modified Files:
	audiostream.h audiostream.cpp 
Log Message:
cleanup

Index: audiostream.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- audiostream.h	9 Jan 2005 03:15:58 -0000	1.43
+++ audiostream.h	9 Jan 2005 15:48:27 -0000	1.44
@@ -102,7 +102,7 @@
 	int getRate() const { return -1; }
 };
 
-AudioStream *makeLinearInputStream(int rate, byte _flags, const byte *ptr, uint32 len, uint loopOffset, uint loopLen);
+AudioStream *makeLinearInputStream(int rate, byte flags, const byte *ptr, uint32 len, uint loopOffset, uint loopLen);
 
 
 // This used to be an inline template function, but

Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- audiostream.cpp	9 Jan 2005 03:15:57 -0000	1.70
+++ audiostream.cpp	9 Jan 2005 15:48:27 -0000	1.71
@@ -185,12 +185,12 @@
 		} else \
 			return new LinearMemoryStream<STEREO, false, UNSIGNED, false>(rate, ptr, len, loopOffset, loopLen, autoFree)
 
-AudioStream *makeLinearInputStream(int rate, byte _flags, const byte *ptr, uint32 len, uint loopOffset, uint loopLen) {
-	const bool isStereo   = (_flags & SoundMixer::FLAG_STEREO) != 0;
-	const bool is16Bit    = (_flags & SoundMixer::FLAG_16BITS) != 0;
-	const bool isUnsigned = (_flags & SoundMixer::FLAG_UNSIGNED) != 0;
-	const bool isLE       = (_flags & SoundMixer::FLAG_LITTLE_ENDIAN) != 0;
-	const bool autoFree   = (_flags & SoundMixer::FLAG_AUTOFREE) != 0;
+AudioStream *makeLinearInputStream(int rate, byte flags, const byte *ptr, uint32 len, uint loopOffset, uint loopLen) {
+	const bool isStereo   = (flags & SoundMixer::FLAG_STEREO) != 0;
+	const bool is16Bit    = (flags & SoundMixer::FLAG_16BITS) != 0;
+	const bool isUnsigned = (flags & SoundMixer::FLAG_UNSIGNED) != 0;
+	const bool isLE       = (flags & SoundMixer::FLAG_LITTLE_ENDIAN) != 0;
+	const bool autoFree   = (flags & SoundMixer::FLAG_AUTOFREE) != 0;
 	
 	if (isStereo) {
 		if (isUnsigned) {