[Scummvm-cvs-logs] CVS: scummvm/sound voc.h,1.14,1.15 voc.cpp,1.22,1.23

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22773/sound

Modified Files:
	voc.h voc.cpp 
Log Message:
change loadVOCFromStream to take a reference instead of a pointer (to a stream)

Index: voc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/voc.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- voc.h	31 Jul 2004 11:46:58 -0000	1.14
+++ voc.h	11 Dec 2004 23:34:33 -0000	1.15
@@ -63,9 +63,9 @@
  */
 extern int getSampleRateFromVOCRate(int vocSR);
 
-extern byte *loadVOCFromStream(Common::ReadStream *stream, int &size, int &rate, int &loops, int &begin_loop, int &end_loop);
-extern byte *loadVOCFromStream(Common::ReadStream *stream, int &size, int &rate);
+extern byte *loadVOCFromStream(Common::ReadStream &stream, int &size, int &rate, int &loops, int &begin_loop, int &end_loop);
+extern byte *loadVOCFromStream(Common::ReadStream &stream, int &size, int &rate);
 
-AudioStream *makeVOCStream(Common::ReadStream *stream);
+AudioStream *makeVOCStream(Common::ReadStream &stream);
 
 #endif

Index: voc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/voc.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- voc.cpp	3 Aug 2004 10:11:54 -0000	1.22
+++ voc.cpp	11 Dec 2004 23:34:33 -0000	1.23
@@ -43,22 +43,22 @@
 	}
 }
 
-byte *loadVOCFromStream(Common::ReadStream *stream, int &size, int &rate) {
+byte *loadVOCFromStream(Common::ReadStream &stream, int &size, int &rate) {
 	int loops, begin_loop, end_loop;
 	return loadVOCFromStream(stream, size, rate, loops, begin_loop, end_loop);
 }
 
-byte *loadVOCFromStream(Common::ReadStream *stream, int &size, int &rate, int &loops, int &begin_loop, int &end_loop) {
+byte *loadVOCFromStream(Common::ReadStream &stream, int &size, int &rate, int &loops, int &begin_loop, int &end_loop) {
 	VocFileHeader fileHeader;
 
-	if (stream->read(&fileHeader, 8) != 8)
+	if (stream.read(&fileHeader, 8) != 8)
 		goto invalid;
 
 	if (!memcmp(&fileHeader, "VTLK", 4)) {
-		if (stream->read(&fileHeader, sizeof(VocFileHeader)) != sizeof(VocFileHeader))
+		if (stream.read(&fileHeader, sizeof(VocFileHeader)) != sizeof(VocFileHeader))
 			goto invalid;
 	} else if (!memcmp(&fileHeader, "Creative", 8)) {
-		if (stream->read(((byte *)&fileHeader) + 8, sizeof(VocFileHeader) - 8) != sizeof(VocFileHeader) - 8)
+		if (stream.read(((byte *)&fileHeader) + 8, sizeof(VocFileHeader) - 8) != sizeof(VocFileHeader) - 8)
 			goto invalid;
 	} else {
 	invalid:;
@@ -86,15 +86,15 @@
 	begin_loop = 0;
 	end_loop = 0;
 
-	while ((code = stream->readByte())) {
-		len = stream->readByte();
-		len |= stream->readByte() << 8;
-		len |= stream->readByte() << 16;
+	while ((code = stream.readByte())) {
+		len = stream.readByte();
+		len |= stream.readByte() << 8;
+		len |= stream.readByte() << 16;
 
 		switch(code) {
 		case 1: {
-			int time_constant = stream->readByte();
-			int packing = stream->readByte();
+			int time_constant = stream.readByte();
+			int packing = stream.readByte();
 			len -= 2;
 			rate = getSampleRateFromVOCRate(time_constant);
 			debug(9, "VOC Data Block: %d, %d, %d", rate, packing, len);
@@ -104,7 +104,7 @@
 				} else {
 					ret_sound = (byte *)malloc(len);
 				}
-				stream->read(ret_sound + size, len);
+				stream.read(ret_sound + size, len);
 				size += len;
 				begin_loop = size;
 				end_loop = size;
@@ -114,7 +114,7 @@
 			} break;
 		case 6:	// begin of loop
 			assert(len == 2);
-			loops = stream->readUint16LE();
+			loops = stream.readUint16LE();
 			break;
 		case 7:	// end of loop
 			assert(len == 0);
@@ -128,7 +128,7 @@
 	return ret_sound;
 }
 
-AudioStream *makeVOCStream(Common::ReadStream *stream) {
+AudioStream *makeVOCStream(Common::ReadStream &stream) {
 	int size, rate;
 	byte *data = loadVOCFromStream(stream, size, rate);