diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/adlmidi_load.cpp | 2 | ||||
| -rw-r--r-- | src/adlmidi_midiplay.cpp | 19 | ||||
| -rw-r--r-- | src/adlmidi_private.hpp | 4 |
3 files changed, 20 insertions, 5 deletions
diff --git a/src/adlmidi_load.cpp b/src/adlmidi_load.cpp index 915b587..e86f23e 100644 --- a/src/adlmidi_load.cpp +++ b/src/adlmidi_load.cpp @@ -203,7 +203,7 @@ bool MIDIplay::LoadMIDI_post() adlins.adl[0] = adl; adlins.adl[1] = adl; adlins.ms_sound_kon = 1000; - adlins.ms_sound_koff = 0; + adlins.ms_sound_koff = 500; adlins.tone = 0; adlins.flags = 0; adlins.voice2_fine_tune = 0.0; diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp index 9276d0e..105d54a 100644 --- a/src/adlmidi_midiplay.cpp +++ b/src/adlmidi_midiplay.cpp @@ -588,6 +588,7 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) int32_t c = adlchannel[ccount]; if(c < 0) continue; + m_chipChannels[c].recent_ins = voices[ccount]; m_chipChannels[c].addAge(0); } @@ -1335,12 +1336,22 @@ void MIDIplay::setErrorString(const std::string &err) int64_t MIDIplay::calculateChipChannelGoodness(size_t c, const MIDIchannel::NoteInfo::Phys &ins) const { - int64_t koff_ms = m_chipChannels[c].koff_time_until_neglible_us / 1000; - int64_t s = (m_synth.m_musicMode != OPL3::MODE_CMF) ? -koff_ms : 0; + const AdlChannel &chan = m_chipChannels[c]; + int64_t koff_ms = chan.koff_time_until_neglible_us / 1000; + int64_t s = -koff_ms; + + // Rate channel with a releasing note + if(s < 0 && chan.users_empty()) + { + s = -10000; + // If it's same instrument, better chance to get it when no free channels + if(chan.recent_ins == ins) + s = (m_synth.m_musicMode == OPL3::MODE_CMF) ? 0 : -5000; + return s; + } // Same midi-instrument = some stability - //if(c == MidCh) s += 4; - for(AdlChannel::LocationData *j = m_chipChannels[c].users_first; j; j = j->next) + for(AdlChannel::LocationData *j = chan.users_first; j; j = j->next) { s -= 4000000; diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index c5b70ee..43986c5 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -880,6 +880,9 @@ public: //! Time left until sounding will be muted after key off int64_t koff_time_until_neglible_us; + //! Recently passed instrument, improves a goodness of released but busy channel when matching + MIDIchannel::NoteInfo::Phys recent_ins; + enum { users_max = 128 }; LocationData *users_first, *users_free_cells; LocationData users_cells[users_max]; @@ -898,6 +901,7 @@ public: AdlChannel(): koff_time_until_neglible_us(0) { users_clear(); + std::memset(&recent_ins, 0, sizeof(MIDIchannel::NoteInfo::Phys)); } AdlChannel(const AdlChannel &oth): koff_time_until_neglible_us(oth.koff_time_until_neglible_us) |