[Scummvm-cvs-logs] CVS: scummvm/sound/softsynth mt32.cpp,1.10,1.11
Max Horn
fingolfin at users.sourceforge.net
Tue May 10 16:00:28 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gob dataio.cpp,1.7,1.8 dataio.h,1.5,1.6 global.cpp,1.5,1.6 global.h,1.4,1.5 gob.cpp,1.13,1.14 inter.cpp,1.18,1.19
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common file.cpp,1.80,1.81 file.h,1.35,1.36 md5.cpp,1.7,1.8 md5.h,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sound/softsynth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17315/sound/softsynth
Modified Files:
mt32.cpp
Log Message:
Moved class File and the MD5 stuff to namespace Common
Index: mt32.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/mt32.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mt32.cpp 22 Apr 2005 17:40:09 -0000 1.10
+++ mt32.cpp 10 May 2005 22:56:20 -0000 1.11
@@ -74,13 +74,11 @@
int getRate() const { return _outputRate; }
};
-typedef File SFile;
-
class MT32File: public MT32Emu::File {
- SFile file;
+ Common::File file;
public:
bool open(const char *filename, OpenMode mode) {
- SFile::AccessMode accessMode = mode == OpenMode_read ? SFile::kFileReadMode : SFile::kFileWriteMode;
+ Common::File::AccessMode accessMode = mode == OpenMode_read ? Common::File::kFileReadMode : Common::File::kFileWriteMode;
return file.open(filename, accessMode);
}
void close() {
@@ -473,7 +471,7 @@
MidiDriver *MidiDriver_MT32_create(SoundMixer *mixer) {
// HACK: It will stay here until engine plugin loader overhaul
if (ConfMan.hasKey("extrapath"))
- File::addDefaultDirectory(ConfMan.get("extrapath"));
+ Common::File::addDefaultDirectory(ConfMan.get("extrapath"));
return new MidiDriver_MT32(mixer);
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gob dataio.cpp,1.7,1.8 dataio.h,1.5,1.6 global.cpp,1.5,1.6 global.h,1.4,1.5 gob.cpp,1.13,1.14 inter.cpp,1.18,1.19
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common file.cpp,1.80,1.81 file.h,1.35,1.36 md5.cpp,1.7,1.8 md5.h,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list