diff options
author | Jerome Fisher | 2005-04-03 22:01:38 +0000 |
---|---|---|
committer | Jerome Fisher | 2005-04-03 22:01:38 +0000 |
commit | eda317924ec0573d5c2a8407feaa8dafb6d4a9bc (patch) | |
tree | 7613d4f6e4af714ffd33af7cee8feba5533d2168 | |
parent | e62d6773ef629e11f966e4b4c3086db8cea58a0b (diff) | |
download | scummvm-rg350-eda317924ec0573d5c2a8407feaa8dafb6d4a9bc.tar.gz scummvm-rg350-eda317924ec0573d5c2a8407feaa8dafb6d4a9bc.tar.bz2 scummvm-rg350-eda317924ec0573d5c2a8407feaa8dafb6d4a9bc.zip |
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
-rw-r--r-- | kyra/sound.cpp | 15 | ||||
-rw-r--r-- | queen/music.cpp | 15 | ||||
-rw-r--r-- | saga/music.cpp | 15 | ||||
-rw-r--r-- | scumm/instrument.cpp | 27 | ||||
-rw-r--r-- | simon/midi.cpp | 18 | ||||
-rw-r--r-- | sky/music/gmchannel.cpp | 14 | ||||
-rw-r--r-- | sky/music/gmchannel.h | 6 | ||||
-rw-r--r-- | sky/music/gmmusic.cpp | 16 | ||||
-rw-r--r-- | sky/music/gmmusic.h | 3 | ||||
-rw-r--r-- | sky/music/mt32music.cpp | 4 | ||||
-rw-r--r-- | sky/music/mt32music.h | 1 | ||||
-rw-r--r-- | sound/mididrv.cpp | 23 | ||||
-rw-r--r-- | sound/mididrv.h | 3 |
13 files changed, 48 insertions, 112 deletions
diff --git a/kyra/sound.cpp b/kyra/sound.cpp index 7505c18672..f6beeb24c5 100644 --- a/kyra/sound.cpp +++ b/kyra/sound.cpp @@ -22,19 +22,6 @@ #include "sound.h" #include "resource.h" -// Instrument mapping for MT32 tracks emulated under GM. -static const byte 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 -}; - namespace Kyra { MusicPlayer::MusicPlayer(MidiDriver* driver, KyraEngine* engine) { _engine = engine; @@ -108,7 +95,7 @@ namespace Kyra { volume = volume * _volume / 255; b = (b & 0xFF00FFFF) | (volume << 16); } else if ((b & 0xF0) == 0xC0 && !_nativeMT32) { - b = (b & 0xFFFF00FF) | mt32_to_gm[(b >> 8) & 0xFF] << 8; + b = (b & 0xFFFF00FF) | MidiDriver::_mt32ToGm[(b >> 8) & 0xFF] << 8; } else if ((b & 0xFFF0) == 0x007BB0) { //Only respond to All Notes Off if this channel //has currently been allocated diff --git a/queen/music.cpp b/queen/music.cpp index 8244c57d95..c601202218 100644 --- a/queen/music.cpp +++ b/queen/music.cpp @@ -29,19 +29,6 @@ namespace Queen { -// Instrument mapping for MT32 tracks emulated under GM. -static const byte 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 -}; - MusicPlayer::MusicPlayer(MidiDriver *driver, byte *data, uint32 size) : _driver(driver), _isPlaying(false), _looping(false), _randomLoop(false), _masterVolume(192), _queuePos(0), _musicData(data), _musicDataSize(size), _passThrough(false), _buf(0) { memset(_channel, 0, sizeof(_channel)); queueClear(); @@ -142,7 +129,7 @@ void MusicPlayer::send(uint32 b) { volume = volume * _masterVolume / 255; b = (b & 0xFF00FFFF) | (volume << 16); } else if ((b & 0xF0) == 0xC0 && !_nativeMT32) { - b = (b & 0xFFFF00FF) | mt32_to_gm[(b >> 8) & 0xFF] << 8; + b = (b & 0xFFFF00FF) | MidiDriver::_mt32ToGm[(b >> 8) & 0xFF] << 8; } else if ((b & 0xFFF0) == 0x007BB0) { //Only respond to All Notes Off if this channel diff --git a/saga/music.cpp b/saga/music.cpp index 70fe3b0c8f..40ce5f670a 100644 --- a/saga/music.cpp +++ b/saga/music.cpp @@ -33,19 +33,6 @@ namespace Saga { -// Instrument mapping for MT32 tracks emulated under GM. -static const byte 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 -}; - #define BUFFER_SIZE 4096 // I haven't decided yet if it's a good idea to make looping part of the audio @@ -239,7 +226,7 @@ void MusicPlayer::send(uint32 b) { volume = volume * _masterVolume / 255; b = (b & 0xFF00FFFF) | (volume << 16); } else if ((b & 0xF0) == 0xC0 && !_isGM && !_nativeMT32) { - b = (b & 0xFFFF00FF) | mt32_to_gm[(b >> 8) & 0xFF] << 8; + b = (b & 0xFFFF00FF) | MidiDriver::_mt32ToGm[(b >> 8) & 0xFF] << 8; } else if ((b & 0xFFF0) == 0x007BB0) { //Only respond to All Notes Off if this channel diff --git a/scumm/instrument.cpp b/scumm/instrument.cpp index f45da061b8..03145cb6d9 100644 --- a/scumm/instrument.cpp +++ b/scumm/instrument.cpp @@ -29,29 +29,6 @@ namespace Scumm { static bool _native_mt32 = false; -static const byte 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 -}; - -static const byte gm_to_mt32[128] = { - 5, 1, 2, 7, 3, 5, 16, 21, 22, 101, 101, 97, 104, 103, 102, 20, - 8, 9, 11, 12, 14, 15, 87, 15, 59, 60, 61, 62, 67, 44, 79, 23, - 64, 67, 66, 70, 68, 69, 28, 31, 52, 54, 55, 56, 49, 51, 57, 112, - 48, 50, 45, 26, 34, 35, 45, 122, 89, 90, 94, 81, 92, 95, 24, 25, - 80, 78, 79, 78, 84, 85, 86, 82, 74, 72, 76, 77, 110, 107, 108, 76, - 47, 44, 111, 45, 44, 34, 44, 30, 32, 33, 88, 34, 35, 35, 38, 33, - 41, 36, 100, 37, 40, 34, 43, 40, 63, 21, 99, 105, 103, 86, 55, 84, - 101, 103, 100, 120, 117, 113, 99, 128, 128, 128, 128, 124, 123, 128, 128, 128, -}; - static struct { const char *name; byte program; @@ -148,7 +125,7 @@ public: void saveOrLoad (Serializer *s); void send (MidiChannel *mc); void copy_to (Instrument *dest) { dest->program (_program, _mt32); } - bool is_valid() { return (_program < 128) && ((_native_mt32 == _mt32) || _native_mt32 ? (gm_to_mt32[_program] < 128) : (mt32_to_gm[_program] < 128)); } + bool is_valid() { return (_program < 128) && ((_native_mt32 == _mt32) || _native_mt32 ? (MidiDriver::_gmToMt32[_program] < 128) : (MidiDriver::_mt32ToGm[_program] < 128)); } operator int() { return (_program < 128) ? _program : 255; } }; @@ -360,7 +337,7 @@ void Instrument_Program::send (MidiChannel *mc) { byte program = _program; if (_native_mt32 != _mt32) - program = _native_mt32 ? gm_to_mt32 [program] : mt32_to_gm [program]; + program = _native_mt32 ? MidiDriver::_gmToMt32 [program] : MidiDriver::_mt32ToGm [program]; if (program < 128) mc->programChange (program); } diff --git a/simon/midi.cpp b/simon/midi.cpp index 2031a68295..ed0d23f23e 100644 --- a/simon/midi.cpp +++ b/simon/midi.cpp @@ -35,22 +35,6 @@ namespace Simon { // and just provide a factory function. extern MidiParser *MidiParser_createS1D(); - -// Instrument mapping for MT32 tracks emulated under GM. -static const byte 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 -}; - - - MidiPlayer::MidiPlayer(OSystem *system) { // Since initialize() is called every time the music changes, // this is where we'll initialize stuff that must persist @@ -117,7 +101,7 @@ void MidiPlayer::send(uint32 b) { volume = volume * _masterVolume / 255; b = (b & 0xFF00FFFF) | (volume << 16); } else if ((b & 0xF0) == 0xC0 && _map_mt32_to_gm) { - b = (b & 0xFFFF00FF) | (mt32_to_gm[(b >> 8) & 0xFF] << 8); + b = (b & 0xFFFF00FF) | (MidiDriver::_mt32ToGm[(b >> 8) & 0xFF] << 8); } else if ((b & 0xFFF0) == 0x007BB0) { // Only respond to an All Notes Off if this channel // has already been allocated. diff --git a/sky/music/gmchannel.cpp b/sky/music/gmchannel.cpp index 82b118eb9e..ec50a160e3 100644 --- a/sky/music/gmchannel.cpp +++ b/sky/music/gmchannel.cpp @@ -25,7 +25,7 @@ namespace Sky { -GmChannel::GmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap, uint8 *veloTab) { +GmChannel::GmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, const byte *pInstMap, const byte *veloTab) { _musicData = pMusicData; _midiDrv = pMidiDrv; @@ -34,7 +34,7 @@ GmChannel::GmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv _channelData.eventDataPtr = startOfData; _channelData.channelActive = 1; _channelData.nextEventTime = getNextEventTime(); - _mt32_to_gm = pInstMap; + _instMap = pInstMap; _veloTab = veloTab; _musicVolume = 0x7F; @@ -130,7 +130,9 @@ uint8 GmChannel::process(uint16 aktTime) { } } else { _channelData.note = opcode; - uint8 velocity = _veloTab[_musicData[_channelData.eventDataPtr]]; + byte velocity = _musicData[_channelData.eventDataPtr]; + if (_veloTab) + velocity = _veloTab[velocity]; _channelData.eventDataPtr++; _midiDrv->send((0x90 | _channelData.midiChannelNumber) | (opcode << 8) | (velocity << 16)); } @@ -155,8 +157,10 @@ void GmChannel::com90_stopChannel(void) { } void GmChannel::com90_setupInstrument(void) { - - _midiDrv->send((0xC0 | _channelData.midiChannelNumber) | (_mt32_to_gm[_musicData[_channelData.eventDataPtr]] << 8)); + byte instrument = _musicData[_channelData.eventDataPtr]; + if (_instMap) + instrument = _instMap[instrument]; + _midiDrv->send((0xC0 | _channelData.midiChannelNumber) | (instrument << 8)); _channelData.eventDataPtr++; } 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; diff --git a/sky/music/gmmusic.cpp b/sky/music/gmmusic.cpp index 8863dbc5e1..daa2071289 100644 --- a/sky/music/gmmusic.cpp +++ b/sky/music/gmmusic.cpp @@ -89,7 +89,7 @@ void GmMusic::setupChannels(uint8 *channelData) { channelData++; for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) { uint16 chDataStart = ((channelData[(cnt << 1) | 1] << 8) | channelData[cnt << 1]) + _musicDataLoc; - _channels[cnt] = new GmChannel(_musicData, chDataStart, _midiDrv, _mt32_to_gm, _veloTab); + _channels[cnt] = new GmChannel(_musicData, chDataStart, _midiDrv, MidiDriver::_mt32ToGm, _veloTab); _channels[cnt]->updateVolume(_musicVolume); } } @@ -102,19 +102,7 @@ void GmMusic::startDriver(void) { // skip all sysEx as it can't be handled anyways. } -byte GmMusic::_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 -}; - -uint8 GmMusic::_veloTab[128] = { +const byte GmMusic::_veloTab[128] = { 0x00, 0x40, 0x41, 0x41, 0x42, 0x42, 0x43, 0x43, 0x44, 0x44, 0x45, 0x45, 0x46, 0x46, 0x47, 0x47, 0x48, 0x48, 0x49, 0x49, 0x4A, 0x4A, 0x4B, 0x4B, 0x4C, 0x4C, 0x4D, 0x4D, 0x4E, 0x4E, diff --git a/sky/music/gmmusic.h b/sky/music/gmmusic.h index 90e9ec68db..b618303500 100644 --- a/sky/music/gmmusic.h +++ b/sky/music/gmmusic.h @@ -40,8 +40,7 @@ private: uint32 _timerCount; uint8 *_sysExSequence; MidiDriver *_midiDrv; - static byte _mt32_to_gm[128]; - static uint8 _veloTab[128]; + static const byte _veloTab[128]; virtual void setupPointers(void); virtual void setupChannels(uint8 *channelData); diff --git a/sky/music/mt32music.cpp b/sky/music/mt32music.cpp index 0b176fe44c..caabb21ec7 100644 --- a/sky/music/mt32music.cpp +++ b/sky/music/mt32music.cpp @@ -40,8 +40,6 @@ MT32Music::MT32Music(MidiDriver *pMidiDrv, Disk *pDisk) int midiRes = _midiDrv->open(); if (midiRes != 0) error("Can't open midi device. Errorcode: %d",midiRes); - for (uint8 cnt = 0; cnt < 128; cnt++) - _dummyMap[cnt] = cnt; _timerCount = 0; _midiDrv->setTimerCallback(this, passTimerFunc); } @@ -86,7 +84,7 @@ void MT32Music::setupChannels(uint8 *channelData) { channelData++; for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) { uint16 chDataStart = ((channelData[(cnt << 1) | 1] << 8) | channelData[cnt << 1]) + _musicDataLoc; - _channels[cnt] = new GmChannel(_musicData, chDataStart, _midiDrv, _dummyMap, _dummyMap); + _channels[cnt] = new GmChannel(_musicData, chDataStart, _midiDrv, NULL, NULL); _channels[cnt]->updateVolume(_musicVolume); } } diff --git a/sky/music/mt32music.h b/sky/music/mt32music.h index bf56f161da..e63fb1ad76 100644 --- a/sky/music/mt32music.h +++ b/sky/music/mt32music.h @@ -41,7 +41,6 @@ private: uint32 _timerCount; uint8 *_sysExSequence; MidiDriver *_midiDrv; - uint8 _dummyMap[128]; virtual void setupPointers(void); virtual void setupChannels(uint8 *channelData); diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 7bca3eff03..5567d7134c 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -69,6 +69,29 @@ static const struct MidiDriverDescription midiDrivers[] = { {0, 0, 0} }; +const byte MidiDriver::_mt32ToGm[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 +}; + +const byte MidiDriver::_gmToMt32[128] = { +// 0 1 2 3 4 5 6 7 8 9 A B C D E F + 5, 1, 2, 7, 3, 5, 16, 21, 22, 101, 101, 97, 104, 103, 102, 20, // 0x + 8, 9, 11, 12, 14, 15, 87, 15, 59, 60, 61, 62, 67, 44, 79, 23, // 1x + 64, 67, 66, 70, 68, 69, 28, 31, 52, 54, 55, 56, 49, 51, 57, 112, // 2x + 48, 50, 45, 26, 34, 35, 45, 122, 89, 90, 94, 81, 92, 95, 24, 25, // 3x + 80, 78, 79, 78, 84, 85, 86, 82, 74, 72, 76, 77, 110, 107, 108, 76, // 4x + 47, 44, 111, 45, 44, 34, 44, 30, 32, 33, 88, 34, 35, 35, 38, 33, // 5x + 41, 36, 100, 37, 40, 34, 43, 40, 63, 21, 99, 105, 103, 86, 55, 84, // 6x + 101, 103, 100, 120, 117, 113, 99, 128, 128, 128, 128, 124, 123, 128, 128, 128, // 7x +}; const MidiDriverDescription *MidiDriver::getAvailableMidiDrivers() { return midiDrivers; diff --git a/sound/mididrv.h b/sound/mididrv.h index 275ef6b437..58082e3cd0 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -91,6 +91,9 @@ public: public: virtual ~MidiDriver() { } + static const byte _mt32ToGm[128]; + static const byte _gmToMt32[128]; + /** * Error codes returned by open. * Can be converted to a string with getErrorName(). |