diff options
| author | Max Horn | 2011-03-21 15:42:17 +0100 |
|---|---|---|
| committer | Max Horn | 2011-03-22 23:51:47 +0100 |
| commit | 8982fff1b79aa3cc53a5c328b283e0f102cb647f (patch) | |
| tree | 01e3835be4fcdf9acbbea5e7878e0c6cfdb5b5fe /engines/scumm/imuse | |
| parent | 92716d71edfe1b23482306e74a1d249c4f43bb0b (diff) | |
| download | scummvm-rg350-8982fff1b79aa3cc53a5c328b283e0f102cb647f.tar.gz scummvm-rg350-8982fff1b79aa3cc53a5c328b283e0f102cb647f.tar.bz2 scummvm-rg350-8982fff1b79aa3cc53a5c328b283e0f102cb647f.zip | |
AUDIO: Add pure virtual MidiDriver::isOpen() method
This in turn enables modifying MidiDriver_MPU401::close() to allow
it to be called on a midi driver that has not yet been opened.
The specific issue that triggered me to make these changes was a
crash-upon-quit in HUGO, caused by it instantiating a midi driver,
then encountering an error (missing hugo.dat) *before* having
opened the new midi driver; the general cleanup code then tries
to close the (not yet opened) midi driver -> kaboom
Also fixed some engines which were leaking MidiDriver instances.
Diffstat (limited to 'engines/scumm/imuse')
| -rw-r--r-- | engines/scumm/imuse/imuse_internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/engines/scumm/imuse/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h index 0014480894..3a6470f832 100644 --- a/engines/scumm/imuse/imuse_internal.h +++ b/engines/scumm/imuse/imuse_internal.h @@ -284,6 +284,7 @@ public: public: // MidiDriver interface int open() { return 0; } + bool isOpen() const { return true; } void close() { } void send(uint32 b); const char *getErrorName(int error_code) { return "Unknown"; } |