Committed patch #1168149 (Shared GM/MT-32 mapping) by eriktorbjorn as-is. This does the following:

- Replaces multiple identical MT-32-to-General MIDI mapping tables with a common one in MidiDriver.
- Changes Sky's GmChannel class to allow NULL instrument and velocity mapping tables, giving a 1-to-1 mapping without creating a dummy table.

svn-id: r17361

1 files changed, 3 insertions, 3 deletions

diff --git a/sky/music/gmchannel.h b/sky/music/gmchannel.h
index deb6681b82..68c99fe43c 100644
--- a/sky/music/gmchannel.h
+++ b/sky/music/gmchannel.h
@@ -39,14 +39,14 @@ typedef struct {
 
 class GmChannel : public ChannelBase {
 public:
-	GmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap, uint8 *veloTab);
+	GmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, const byte *pInstMap, const byte *veloTab);
 	virtual void stopNote(void);
 	virtual uint8 process(uint16 aktTime);
 	virtual void updateVolume(uint16 pVolume);
 	virtual bool isActive(void);
 private:
-	byte *_mt32_to_gm;
-	uint8 *_veloTab;
+	const byte *_instMap;
+	const byte *_veloTab;
 	MidiDriver *_midiDrv;
 	uint8 *_musicData;
 	uint16 _musicVolume;