From 8982fff1b79aa3cc53a5c328b283e0f102cb647f Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 21 Mar 2011 15:42:17 +0100
Subject: 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.
---
 engines/touche/midi.cpp | 4 ++++
 engines/touche/midi.h   | 1 +
 2 files changed, 5 insertions(+)

(limited to 'engines/touche')

diff --git a/engines/touche/midi.cpp b/engines/touche/midi.cpp
index 0b15643767..c420fb34ff 100644
--- a/engines/touche/midi.cpp
+++ b/engines/touche/midi.cpp
@@ -110,6 +110,10 @@ int MidiPlayer::open() {
 	return ret;
 }
 
+bool MidiPlayer::isOpen() const {
+	return _driver && _driver->isOpen();
+}
+
 void MidiPlayer::close() {
 	stop();
 	_mutex.lock();
diff --git a/engines/touche/midi.h b/engines/touche/midi.h
index 8e43c12037..75f33269a7 100644
--- a/engines/touche/midi.h
+++ b/engines/touche/midi.h
@@ -59,6 +59,7 @@ public:
 
 	// MidiDriver interface
 	int open();
+	bool isOpen() const;
 	void close();
 	void send(uint32 b);
 	void metaEvent(byte type, byte *data, uint16 length);
-- 
cgit v1.2.3