diff options
Diffstat (limited to 'engines/scumm/imuse/instrument.cpp')
| -rw-r--r-- | engines/scumm/imuse/instrument.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp index bc8380f1b1..efe15f308f 100644 --- a/engines/scumm/imuse/instrument.cpp +++ b/engines/scumm/imuse/instrument.cpp @@ -144,12 +144,12 @@ public: : (MidiDriver::_mt32ToGm[_program] < 128)); } }; -class Instrument_Adlib : public InstrumentInternal { +class Instrument_AdLib : public InstrumentInternal { private: #include "common/pack-start.h" // START STRUCT PACKING - struct AdlibInstrument { + struct AdLibInstrument { byte flags_1; byte oplvl_1; byte atdec_1; @@ -170,11 +170,11 @@ private: #include "common/pack-end.h" // END STRUCT PACKING - AdlibInstrument _instrument; + AdLibInstrument _instrument; public: - Instrument_Adlib(const byte *data); - Instrument_Adlib(Serializer *s); + Instrument_AdLib(const byte *data); + Instrument_AdLib(Serializer *s); void saveOrLoad(Serializer *s); void send(MidiChannel *mc); void copy_to(Instrument *dest) { dest->adlib((byte *)&_instrument); } @@ -290,8 +290,8 @@ void Instrument::adlib(const byte *instrument) { clear(); if (!instrument) return; - _type = itAdlib; - _instrument = new Instrument_Adlib(instrument); + _type = itAdLib; + _instrument = new Instrument_AdLib(instrument); } void Instrument::roland(const byte *instrument) { @@ -316,8 +316,8 @@ void Instrument::saveOrLoad (Serializer *s) { case itProgram: _instrument = new Instrument_Program(s); break; - case itAdlib: - _instrument = new Instrument_Adlib(s); + case itAdLib: + _instrument = new Instrument_AdLib(s); break; case itRoland: _instrument = new Instrument_Roland(s); @@ -371,29 +371,29 @@ void Instrument_Program::send(MidiChannel *mc) { //////////////////////////////////////// // -// Instrument_Adlib class members +// Instrument_AdLib class members // //////////////////////////////////////// -Instrument_Adlib::Instrument_Adlib(const byte *data) { +Instrument_AdLib::Instrument_AdLib(const byte *data) { memcpy(&_instrument, data, sizeof(_instrument)); } -Instrument_Adlib::Instrument_Adlib(Serializer *s) { +Instrument_AdLib::Instrument_AdLib(Serializer *s) { if (!s->isSaving()) saveOrLoad(s); else memset(&_instrument, 0, sizeof(_instrument)); } -void Instrument_Adlib::saveOrLoad(Serializer *s) { +void Instrument_AdLib::saveOrLoad(Serializer *s) { if (s->isSaving()) s->saveBytes(&_instrument, sizeof(_instrument)); else s->loadBytes(&_instrument, sizeof(_instrument)); } -void Instrument_Adlib::send(MidiChannel *mc) { +void Instrument_AdLib::send(MidiChannel *mc) { mc->sysEx_customInstrument('ADL ', (byte *)&_instrument); } |