diff options
| author | David Corrales | 2007-08-05 19:34:20 +0000 |
|---|---|---|
| committer | David Corrales | 2007-08-05 19:34:20 +0000 |
| commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
| tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/touche/midi.h | |
| parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
| parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
| download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip | |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/touche/midi.h')
| -rw-r--r-- | engines/touche/midi.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/touche/midi.h b/engines/touche/midi.h index 808ecfb205..3b128593db 100644 --- a/engines/touche/midi.h +++ b/engines/touche/midi.h @@ -46,7 +46,7 @@ public: NUM_CHANNELS = 16 }; - MidiPlayer(MidiDriver *driver); + MidiPlayer(MidiDriver *driver, bool nativeMT32); ~MidiPlayer(); void play(Common::ReadStream &stream, int size, bool loop = false); @@ -77,9 +77,12 @@ private: bool _isLooping; bool _isPlaying; int _masterVolume; + bool _nativeMT32; MidiChannel *_channelsTable[NUM_CHANNELS]; uint8 _channelsVolume[NUM_CHANNELS]; Common::Mutex _mutex; + + static const uint8 _gmToRol[]; }; } // namespace Touche |