[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.cpp,1.126,1.127 d_sound.h,1.53,1.54

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3780/sword2/driver

Modified Files:
	d_sound.cpp d_sound.h 
Log Message:
AudioStream::read() has been removed quite some time ago, now making sure that change is reflected everywhere

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- d_sound.cpp	17 Oct 2004 19:39:46 -0000	1.126
+++ d_sound.cpp	27 Nov 2004 13:54:09 -0000	1.127
@@ -166,7 +166,6 @@
 
 	int readBuffer(int16 *buffer, const int numSamples);
 
-	int16 read();
 	bool endOfData() const	{ return eosIntern(); }
 	bool isStereo() const	{ return false; }
 	int getRate() const	{ return 22050; }
@@ -189,16 +188,6 @@
 	_file->decRef();
 }
 
-inline int16 CLUInputStream::read() {
-	assert(!eosIntern());
-
-	int16 sample = *_pos++;
-	if (_pos >= _bufferEnd) {
-		refill();
-	}
-	return sample;
-}
-
 inline bool CLUInputStream::eosIntern() const {
 	return _pos >= _bufferEnd;
 }
@@ -566,10 +555,6 @@
 	return numSamples;
 }
 
-int16 Sound::read() {
-	error("ProcInputStream::read not supported");
-}
-
 bool Sound::isStereo() const { return false; }
 bool Sound::endOfData() const { return !fpMus.isOpen(); }
 int Sound::getRate() const { return 22050; }

Index: d_sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- d_sound.h	12 Oct 2004 17:03:07 -0000	1.53
+++ d_sound.h	27 Nov 2004 13:54:09 -0000	1.54
@@ -93,7 +93,6 @@
 	// AudioStream API
 
 	int readBuffer(int16 *buffer, const int numSamples);
-	int16 read();
 	bool isStereo() const;
 	bool endOfData() const;
 	int getRate() const;