[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.cpp,1.148,1.149

Max Horn fingolfin at users.sourceforge.net
Tue May 10 15:58:43 CEST 2005


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

Modified Files:
	d_sound.cpp 
Log Message:
Moved class File and the MD5 stuff to namespace Common

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- d_sound.cpp	5 May 2005 15:59:24 -0000	1.148
+++ d_sound.cpp	10 May 2005 22:56:25 -0000	1.149
@@ -40,7 +40,7 @@
 
 namespace Sword2 {
 
-static AudioStream *makeCLUStream(File *fp, int size);
+static AudioStream *makeCLUStream(Common::File *fp, int size);
 
 static AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, int cd, uint32 id, uint32 *numSamples) {
 	if (!fh->file->isOpen()) {
@@ -64,7 +64,7 @@
 		char filename[20];
 
 		for (int i = 0; i < ARRAYSIZE(file_types); i++) {
-			File f;
+			Common::File f;
 
 			sprintf(filename, "%s%d.%s", base, cd, file_types[i].ext);
 			if (f.open(filename)) {
@@ -156,7 +156,7 @@
 #define GetCompressedSign(n)       (((n) >> 3) & 1)
 #define GetCompressedAmplitude(n)  ((n) & 7)
 
-CLUInputStream::CLUInputStream(File *file, int size)
+CLUInputStream::CLUInputStream(Common::File *file, int size)
 	: _file(file), _firstTime(true), _bufferEnd(_outbuf + BUFFER_SIZE) {
 
 	_file->incRef();
@@ -226,7 +226,7 @@
 	_bufferEnd = out;
 }
 
-AudioStream *makeCLUStream(File *file, int size) {
+AudioStream *makeCLUStream(Common::File *file, int size) {
 	return new CLUInputStream(file, size);
 }
 





More information about the Scummvm-git-logs mailing list