[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.cpp,1.85,1.86 d_sound.h,1.33,1.34

[Max Horn]

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

Modified Files:
	d_sound.cpp d_sound.h 
Log Message:
I am going to remove the default implementation of readBuffer() (AudioInputStream subclasses really really should implement readBuffer() for good performance)

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- d_sound.cpp	17 Dec 2003 11:52:05 -0000	1.85
+++ d_sound.cpp	19 Dec 2003 00:27:09 -0000	1.86
@@ -106,9 +106,7 @@
 }
 
 bool MusicHandle::eos() const {
-	if (!_streaming || _filePos >= _fileEnd)
-		return true;
-	return false;
+	return (!_streaming || _filePos >= _fileEnd);
 }
 
 static void premix_proc(void *param, int16 *data, uint len) {

Index: d_sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- d_sound.h	17 Dec 2003 02:19:24 -0000	1.33
+++ d_sound.h	19 Dec 2003 00:27:09 -0000	1.34
@@ -59,6 +59,14 @@
 	bool isStereo()	const	{ return false; }
 	int getRate() const	{ return 22050; }
 
+	virtual int readBuffer(int16 *buffer, const int numSamples) {
+		int samples;
+		for (samples = 0; samples < numSamples && !eos(); samples++) {
+			*buffer++ = read();
+		}
+		return samples;
+	}
+
 	int16 read();
 	bool eos() const;