[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.h,1.34,1.35 d_sound.cpp,1.87,1.88

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv29710/sword2/driver

Modified Files:
	d_sound.h d_sound.cpp 
Log Message:
distinguish between end of stream and end of data

Index: d_sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- d_sound.h	19 Dec 2003 00:27:09 -0000	1.34
+++ d_sound.h	19 Dec 2003 01:30:19 -0000	1.35
@@ -61,14 +61,16 @@
 
 	virtual int readBuffer(int16 *buffer, const int numSamples) {
 		int samples;
-		for (samples = 0; samples < numSamples && !eos(); samples++) {
+		for (samples = 0; samples < numSamples && !endOfData(); samples++) {
 			*buffer++ = read();
 		}
 		return samples;
 	}
 
 	int16 read();
-	bool eos() const;
+	bool endOfData() const;
+	// This stream never 'ends'
+	bool endOfStream() const { return false; }
 
 	MusicHandle() : _firstTime(false),
 			_streaming(false), _paused(false), _looping(false),

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- d_sound.cpp	19 Dec 2003 01:08:30 -0000	1.87
+++ d_sound.cpp	19 Dec 2003 01:30:19 -0000	1.88
@@ -105,7 +105,7 @@
 	return out;
 }
 
-bool MusicHandle::eos() const {
+bool MusicHandle::endOfData() const {
 	return (!_streaming || _filePos >= _fileEnd);
 }