Fixed MIDI channel conflict between music and MIDI sound effects in simon1dos.

Also added notes about the GMF header for posterity's sake.

svn-id: r7877

1 files changed, 5 insertions, 5 deletions

diff --git a/simon/midi.h b/simon/midi.h
index 02930f8960..2c6c6acbf8 100644
--- a/simon/midi.h
+++ b/simon/midi.h
@@ -31,17 +31,17 @@ class OSystem;
 struct MusicInfo {
 	MidiParser *parser;
 	byte * data;
-	byte   num_songs;      // For Type 1 SMF resources
-	byte * songs[16];      // For Type 1 SMF resources
-	uint32 song_sizes[16]; // For Type 1 SMF resources
-	bool   in_use[16];     // Tracks which resource is using which MIDI channels
+	byte   num_songs;         // For Type 1 SMF resources
+	byte * songs[16];         // For Type 1 SMF resources
+	uint32 song_sizes[16];    // For Type 1 SMF resources
+	MidiChannel *channel[16]; // Dynamic remapping of channels to resolve conflicts
 
 	MusicInfo() { clear(); }
 	void clear() {
 		parser = 0; data = 0; num_songs = 0;
 		memset (songs, 0, sizeof (songs));
 		memset (song_sizes, 0, sizeof (song_sizes));
-		memset (in_use, 0, sizeof (in_use));
+		memset (channel, 0, sizeof (channel));
 	}
 };