diff options
| -rw-r--r-- | src/adlmidi_load.cpp | 7 | ||||
| -rw-r--r-- | utils/gen_adldata/file_formats/load_wopl.h | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/adlmidi_load.cpp b/src/adlmidi_load.cpp index 6f68a11..16881d4 100644 --- a/src/adlmidi_load.cpp +++ b/src/adlmidi_load.cpp @@ -232,11 +232,14 @@ bool MIDIplay::LoadBank(MIDIplay::fileReader &fr) } /*UNUSED YET*/ - //bool default_deep_vibrato = ((head[4]>>0) & 0x01); - //bool default_deep_tremolo = ((head[4]>>1) & 0x01); + bool default_deep_vibrato = ((head[4]>>0) & 0x01); + bool default_deep_tremolo = ((head[4]>>1) & 0x01); //5'th byte reserved for Deep-Tremolo and Deep-Vibrato flags + m_setup.HighTremoloMode = default_deep_tremolo; + m_setup.HighVibratoMode = default_deep_vibrato; //6'th byte reserved for ADLMIDI's default volume model + m_setup.VolumeModel = (int)head[5]; if(version >= 2)//Read bank meta-entries { diff --git a/utils/gen_adldata/file_formats/load_wopl.h b/utils/gen_adldata/file_formats/load_wopl.h index a14ed71..311b742 100644 --- a/utils/gen_adldata/file_formats/load_wopl.h +++ b/utils/gen_adldata/file_formats/load_wopl.h @@ -54,11 +54,11 @@ static bool LoadWopl(const char *fn, unsigned bank, const char *prefix) uint16_t pbanks_count = toUint16BE((const uint8_t *)data.data() + 0x0f); AdlBankSetup setup; - setup.deepTremolo = data[0x11] & 0x80; - setup.deepVibrato = data[0x11] & 0x40; + setup.deepTremolo = (data[0x11] >> 0) & 0x01; + setup.deepVibrato = (data[0x11] >> 1) & 0x01; setup.volumeModel = (int)data[0x12]; setup.adLibPercussions = false; - setup.scaleModulators = false; + setup.scaleModulators = false; // Validate file format by size calculation if(version == 1) |