Ticket #8917: mt32-archive.patch

sound/softsynth/mt32.cpp

@@ -32 +32 @@
 #include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
+#include "common/archive.h"
 #include "common/config-manager.h"
 #include "common/events.h"
 #include "common/file.h"
@@ -80 +81 @@
 };
 
 class MT32File : public MT32Emu::File {
-        Common::File _in;
+        Common::SeekableReadStream *_in;
         Common::DumpFile _out;
 public:
+        MT32File() : _in(0) { }
+        ~MT32File() { close(); }
         bool open(const char *filename, OpenMode mode) {
                 if (mode == OpenMode_read)
-                        return _in.open(filename);
+                        return (_in = SearchMan.openFile(filename));
                 else
                         return _out.open(filename);
         }
         void close() {
-                _in.close();
+                delete _in; _in = 0;
                 _out.close();
         }
         size_t read(void *in, size_t size) {
-                return _in.read(in, size);
+                return _in->read(in, size);
         }
         bool readBit8u(MT32Emu::Bit8u *in) {
-                byte b = _in.readByte();
-                if (_in.eof())
+                byte b = _in->readByte();
+                if (_in->eos())
                         return false;
                 *in = b;
                 return true;
@@ -111 +114 @@
                 return !_out.ioFailed();
         }
         bool isEOF() {
-                return _in.isOpen() ? _in.eof() : _out.eof();
+                return _in ? _in->eos() : _out.eos();
         }
 };
 
@@ -511 +514 @@
 }
 
 MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer) {
-        // HACK: It will stay here until engine plugin loader overhaul
-        if (ConfMan.hasKey("extrapath"))
-                Common::File::addDefaultDirectory(ConfMan.get("extrapath"));
-
         MidiDriver *mididriver;
 
         MT32EmuMusicPlugin p;