[Scummvm-cvs-logs] CVS: scummvm/sound audiostream.cpp,1.45,1.46

[Max Horn]

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

Modified Files:
	audiostream.cpp 
Log Message:
fix for recent audio stream regression

Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- audiostream.cpp	17 Dec 2003 02:19:24 -0000	1.45
+++ audiostream.cpp	19 Dec 2003 00:09:34 -0000	1.46
@@ -132,7 +132,7 @@
 
 	int16 read();
 	bool isStereo() const		{ return stereo; }
-	bool eos() const			{ return _finalized; }
+	bool eos() const			{ return _finalized && eosIntern(); }
 
 	int getRate() const			{ return _rate; }
 
@@ -143,7 +143,7 @@
 
 template<bool stereo, bool is16Bit, bool isUnsigned>
 WrappedMemoryStream<stereo, is16Bit, isUnsigned>::WrappedMemoryStream(int rate, uint bufferSize)
- : _rate(rate) {
+ : _finalized(false), _rate(rate) {
 
 	// Verify the buffer size is sane
 	if (is16Bit && stereo)
@@ -154,8 +154,6 @@
 	_bufferStart = (byte *)malloc(bufferSize);
 	_pos = _end = _bufferStart;
 	_bufferEnd = _bufferStart + bufferSize;
-	
-	_finalized = false;
 }
 
 template<bool stereo, bool is16Bit, bool isUnsigned>