[Scummvm-cvs-logs] CVS: scummvm/sound audiostream.cpp,1.9,1.10 mixer.cpp,1.84,1.85 rate.cpp,1.8,1.9

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv2122/scummvm/sound

Modified Files:
	audiostream.cpp mixer.cpp rate.cpp 
Log Message:
Fixed MSVC errors

Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- audiostream.cpp	29 Jul 2003 12:39:41 -0000	1.9
+++ audiostream.cpp	30 Jul 2003 09:26:54 -0000	1.10
@@ -19,6 +19,7 @@
  *
  */
 
+#include "stdafx.h"
 #include "audiostream.h"
 #include "mixer.h"
 #include "common/engine.h"
@@ -40,9 +41,11 @@
 	}
 }
 
+#ifndef _MSC_VER
 #pragma mark -
 #pragma mark --- LinearMemoryStream ---
 #pragma mark -
+#endif
 
 
 template<bool stereo, bool is16Bit, bool isUnsigned>
@@ -72,9 +75,11 @@
 };
 
 
+#ifndef _MSC_VER
 #pragma mark -
 #pragma mark --- WrappedMemoryStream ---
 #pragma mark -
+#endif
 
 
 // Wrapped memory stream, to be used by the ChannelStream class (and possibly others?)
@@ -153,9 +158,11 @@
 }
 
 
+#ifndef _MSC_VER
 #pragma mark -
 #pragma mark --- MP3 (MAD) stream ---
 #pragma mark -
+#endif
 
 
 #ifdef USE_MAD
@@ -174,9 +181,11 @@
 #endif
 
 
+#ifndef _MSC_VER
 #pragma mark -
 #pragma mark --- Ogg Vorbis stream ---
 #pragma mark -
+#endif
 
 
 #ifdef USE_VORBIS
@@ -255,9 +264,11 @@
 #endif
 
 
+#ifndef _MSC_VER
 #pragma mark -
 #pragma mark --- Input stream factories ---
 #pragma mark -
+#endif
 
 
 template<bool stereo>
@@ -294,16 +305,16 @@
 
 AudioInputStream *makeLinearInputStream(byte _flags, const byte *ptr, uint32 len) {
 	if (_flags & SoundMixer::FLAG_STEREO) {
-		return makeLinearInputStream<true>(ptr, len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS);
+		return makeLinearInputStream<true>(ptr, len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS != 0);
 	} else {
-		return makeLinearInputStream<false>(ptr, len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS);
+		return makeLinearInputStream<false>(ptr, len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS != 0);
 	}
 }
 
 WrappedAudioInputStream *makeWrappedInputStream(byte _flags, uint32 len) {
 	if (_flags & SoundMixer::FLAG_STEREO) {
-		return makeWrappedInputStream<true>(len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS);
+		return makeWrappedInputStream<true>(len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS != 0);
 	} else {
-		return makeWrappedInputStream<false>(len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS);
+		return makeWrappedInputStream<false>(len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS != 0);
 	}
 }

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- mixer.cpp	29 Jul 2003 13:36:06 -0000	1.84
+++ mixer.cpp	30 Jul 2003 09:26:54 -0000	1.85
@@ -677,7 +677,7 @@
 	// TODO: add support for SoundMixer::FLAG_REVERSE_STEREO
 
 	// Get a rate converter instance
-	_converter = makeRateConverter(rate, mixer->getOutputRate(), flags & SoundMixer::FLAG_STEREO);
+	_converter = makeRateConverter(rate, mixer->getOutputRate(), flags & SoundMixer::FLAG_STEREO != 0);
 #else
 	_pos = 0;
 	_fpPos = 0;
@@ -725,7 +725,7 @@
 
 	const int volume = _mixer->getVolume();
 	uint tmpLen = len;
-	_converter->flow(*_input, data, &tmpLen, volume);
+	_converter->flow(*_input, data, (st_size_t *) &tmpLen, volume);
 #else
 	byte *s, *end;
 
@@ -768,7 +768,7 @@
 	// TODO: add support for SoundMixer::FLAG_REVERSE_STEREO
 
 	// Get a rate converter instance
-	_converter = makeRateConverter(rate, mixer->getOutputRate(), flags & SoundMixer::FLAG_STEREO);
+	_converter = makeRateConverter(rate, mixer->getOutputRate(), flags & SoundMixer::FLAG_STEREO != 0);
 #else
 	_flags = flags;
 	_bufferSize = buffer_size;
@@ -846,7 +846,7 @@
 
 	const int volume = _mixer->getVolume();
 	uint tmpLen = len;
-	_converter->flow(*_input, data, &tmpLen, volume);
+	_converter->flow(*_input, data, (st_size_t *) &tmpLen, volume);
 #else
 	if (_pos == _endOfData) {
 		// Normally, the stream stays around even if all its data is used up.

Index: rate.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/rate.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rate.cpp	29 Jul 2003 01:35:37 -0000	1.8
+++ rate.cpp	30 Jul 2003 09:26:54 -0000	1.9
@@ -141,7 +141,7 @@
 		while (rate->ipos > rate->opos && obuf < oend) {
 
 			// interpolate
-			out = ilast[0] + (((icur[0] - ilast[0]) * rate->opos_frac + (1UL << (FRAC_BITS-1))) >> FRAC_BITS);
+			out = (st_sample_t) (ilast[0] + (((icur[0] - ilast[0]) * rate->opos_frac + (1UL << (FRAC_BITS-1))) >> FRAC_BITS));
 			// adjust volume
 			out = out * vol / 256;
 	
@@ -150,7 +150,7 @@
 			
 			if (stereo) {
 				// interpolate
-				out = ilast[1] + (((icur[1] - ilast[1]) * rate->opos_frac + (1UL << (FRAC_BITS-1))) >> FRAC_BITS);
+				out = (st_sample_t) (ilast[1] + (((icur[1] - ilast[1]) * rate->opos_frac + (1UL << (FRAC_BITS-1))) >> FRAC_BITS));
 				// adjust volume
 				out = out * vol / 256;
 			}
@@ -180,7 +180,9 @@
 }
 
 
+#ifndef _MSC_VER
 #pragma mark -
+#endif
 
 
 LinearRateConverter::LinearRateConverter(st_rate_t inrate, st_rate_t outrate) {