diff options
| -rw-r--r-- | src/adlmidi_load.cpp | 5 | ||||
| -rw-r--r-- | src/adlmidi_midiplay.cpp | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/adlmidi_load.cpp b/src/adlmidi_load.cpp index 3e790db..8a7f7ba 100644 --- a/src/adlmidi_load.cpp +++ b/src/adlmidi_load.cpp @@ -109,6 +109,9 @@ bool MIDIplay::LoadBank(FileAndMemReader &fr) } Synth &synth = *m_synth; + + synth.setEmbeddedBank(m_setup.bankId); + synth.m_insBankSetup.scaleModulators = false; synth.m_insBankSetup.deepTremolo = (wopl->opl_flags & WOPL_FLAG_DEEP_TREMOLO) != 0; synth.m_insBankSetup.deepVibrato = (wopl->opl_flags & WOPL_FLAG_DEEP_VIBRATO) != 0; @@ -117,8 +120,6 @@ bool MIDIplay::LoadBank(FileAndMemReader &fr) m_setup.deepVibratoMode = -1; m_setup.volumeScaleModel = ADLMIDI_VolumeModel_AUTO; - synth.setEmbeddedBank(m_setup.bankId); - uint16_t slots_counts[2] = {wopl->banks_count_melodic, wopl->banks_count_percussion}; WOPLBank *slots_src_ins[2] = { wopl->banks_melodic, wopl->banks_percussive }; diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp index 70e5854..414427c 100644 --- a/src/adlmidi_midiplay.cpp +++ b/src/adlmidi_midiplay.cpp @@ -413,13 +413,10 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) if(ains->tone) { - /*if(ains->tone < 20) - tone += ains->tone; - else*/ - if(ains->tone < 128) - tone = ains->tone; + if(ains->tone >= 128) + tone = ains->tone - 128; else - tone -= ains->tone - 128; + tone = ains->tone; } //uint16_t i[2] = { ains->adlno1, ains->adlno2 }; |