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 /saga/music.cpp | |
| 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
Diffstat (limited to 'saga/music.cpp')
| -rw-r--r-- | saga/music.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
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 |