diff options
author | Robert Göffringmann | 2003-05-12 23:25:54 +0000 |
---|---|---|
committer | Robert Göffringmann | 2003-05-12 23:25:54 +0000 |
commit | 4162a22121bcf2845b5f3b206f516a1bf6754a3c (patch) | |
tree | 35dabb56d7d30abe9705cc31a6176ecf82d918e1 /sky/gmchannel.cpp | |
parent | 299a1a451fdbde6f7c8bed40596dc3a6786a6c3b (diff) | |
download | scummvm-rg350-4162a22121bcf2845b5f3b206f516a1bf6754a3c.tar.gz scummvm-rg350-4162a22121bcf2845b5f3b206f516a1bf6754a3c.tar.bz2 scummvm-rg350-4162a22121bcf2845b5f3b206f516a1bf6754a3c.zip |
changed some internal structures, added support for true MT32 (though not yet used by main prog)
svn-id: r7483
Diffstat (limited to 'sky/gmchannel.cpp')
-rw-r--r-- | sky/gmchannel.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sky/gmchannel.cpp b/sky/gmchannel.cpp index 6383427c0d..4850f654c1 100644 --- a/sky/gmchannel.cpp +++ b/sky/gmchannel.cpp @@ -21,21 +21,7 @@ #include "gmchannel.h" -// instrument map copied from scumm/instrument.cpp - -const byte SkyGmChannel::_mt32_to_gm[128] = { -// 0 1 2 3 4 5 6 7 8 9 A B C D E F - 0, 1, 0, 2, 4, 4, 5, 3, 16, 17, 18, 16, 16, 19, 20, 21, // 0x - 6, 6, 6, 7, 7, 7, 8, 112, 62, 62, 63, 63, 38, 38, 39, 39, // 1x - 88, 95, 52, 98, 97, 99, 14, 54, 102, 96, 53, 102, 81, 100, 14, 80, // 2x - 48, 48, 49, 45, 41, 40, 42, 42, 43, 46, 45, 24, 25, 28, 27, 104, // 3x - 32, 32, 34, 33, 36, 37, 35, 35, 79, 73, 72, 72, 74, 75, 64, 65, // 4x - 66, 67, 71, 71, 68, 69, 70, 22, 56, 59, 57, 57, 60, 60, 58, 61, // 5x - 61, 11, 11, 98, 14, 9, 14, 13, 12, 107, 107, 77, 78, 78, 76, 76, // 6x - 47, 117, 127, 118, 118, 116, 115, 119, 115, 112, 55, 124, 123, 0, 14, 117 // 7x -}; - -SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv) +SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap) { _musicData = pMusicData; _midiDrv = pMidiDrv; @@ -43,6 +29,7 @@ SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pM _channelData.eventDataPtr = startOfData; _channelData.channelActive = 1; _channelData.nextEventTime = getNextEventTime(); + _mt32_to_gm = pInstMap; _musicVolume = 0x100; } |