diff options
author | Max Horn | 2005-05-10 22:56:25 +0000 |
---|---|---|
committer | Max Horn | 2005-05-10 22:56:25 +0000 |
commit | b75c969e666b9f262a05e0d1e54d56f7d3e45441 (patch) | |
tree | e4868d14ac249a63e01f905472ec9be69f04a028 /sound/softsynth | |
parent | 55c37c18ceed916eb3744666d3d10783b0cf8783 (diff) | |
download | scummvm-rg350-b75c969e666b9f262a05e0d1e54d56f7d3e45441.tar.gz scummvm-rg350-b75c969e666b9f262a05e0d1e54d56f7d3e45441.tar.bz2 scummvm-rg350-b75c969e666b9f262a05e0d1e54d56f7d3e45441.zip |
Moved class File and the MD5 stuff to namespace Common
svn-id: r18037
Diffstat (limited to 'sound/softsynth')
-rw-r--r-- | sound/softsynth/mt32.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/softsynth/mt32.cpp b/sound/softsynth/mt32.cpp index 75abaabbcc..58f13f45c6 100644 --- a/sound/softsynth/mt32.cpp +++ b/sound/softsynth/mt32.cpp @@ -74,13 +74,11 @@ public: 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 @@ void MidiDriver_ThreadedMT32::onTimer() { 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); } |