diff options
| -rw-r--r-- | src/adlmidi_midiplay.cpp | 50 | ||||
| -rw-r--r-- | src/adlmidi_midiplay.hpp | 4 | ||||
| -rw-r--r-- | src/adlmidi_sequencer.cpp | 10 | ||||
| -rw-r--r-- | src/midi_sequencer_impl.hpp | 2 |
4 files changed, 51 insertions, 15 deletions
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp index 8b2f185..6261181 100644 --- a/src/adlmidi_midiplay.cpp +++ b/src/adlmidi_midiplay.cpp @@ -26,6 +26,10 @@ #include "adlmidi_private.hpp" #include "midi_sequencer.hpp" +// Minimum life time of percussion notes +static const double drum_note_min_time = 0.03; + + // Mapping from MIDI volume level to OPL level value. static const uint_fast32_t DMX_volume_mapping_table[128] = @@ -255,8 +259,33 @@ void MIDIplay::resetMIDI() void MIDIplay::TickIterators(double s) { Synth &synth = *m_synth; - for(uint16_t c = 0; c < synth.m_numChannels; ++c) - m_chipChannels[c].addAge(static_cast<int64_t>(s * 1e6)); + for(uint32_t c = 0, n = synth.m_numChannels; c < n; ++c) + { + AdlChannel &ch = m_chipChannels[c]; + ch.addAge(static_cast<int64_t>(s * 1e6)); + } + + // Resolve "hell of all times" of too short drum notes + for(size_t c = 0, n = m_midiChannels.size(); c < n; ++c) + { + MIDIchannel &ch = m_midiChannels[c]; + for(MIDIchannel::notes_iterator inext = ch.activenotes.begin(); !inext.is_end();) + { + MIDIchannel::notes_iterator i(inext++); + MIDIchannel::NoteInfo &ni = i->value; + double ttl = ni.ttl; + if(ttl > 0) + { + ni.ttl = ttl = ttl - s; + if(ni.isOnExtendedLifeTime && ttl <= 0) + { + noteUpdate(c, i, Upd_Off); + ni.isOnExtendedLifeTime = false; + } + } + } + } + updateVibrato(s); updateArpeggio(s); #if !defined(ADLMIDI_AUDIO_TICK_HANDLER) @@ -472,6 +501,8 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) MIDIchannel::notes_iterator i = midiChan.ensure_find_or_create_activenote(note); MIDIchannel::NoteInfo &dummy = i->value; dummy.isBlank = true; + dummy.isOnExtendedLifeTime = false; + dummy.ttl = 0; dummy.ains = NULL; dummy.chip_channels_count = 0; // Record the last note on MIDI channel as source of portamento @@ -576,6 +607,8 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) ni.midiins = midiins; ni.isPercussion = isPercussion; ni.isBlank = isBlankNote; + ni.isOnExtendedLifeTime = false; + ni.ttl = isPercussion ? drum_note_min_time : 0; ni.ains = ains; ni.chip_channels_count = 0; @@ -1688,10 +1721,17 @@ void MIDIplay::updatePortamento(size_t midCh) void MIDIplay::noteOff(size_t midCh, uint8_t note) { - MIDIchannel::notes_iterator - i = m_midiChannels[midCh].find_activenote(note); + MIDIchannel &ch = m_midiChannels[midCh]; + MIDIchannel::notes_iterator i = ch.find_activenote(note); + if(!i.is_end()) - noteUpdate(midCh, i, Upd_Off); + { + MIDIchannel::NoteInfo &ni = i->value; + if(ni.ttl <= 0) + noteUpdate(midCh, i, Upd_Off); + else + ni.isOnExtendedLifeTime = true; + } } diff --git a/src/adlmidi_midiplay.hpp b/src/adlmidi_midiplay.hpp index fd58b13..d3e5ea4 100644 --- a/src/adlmidi_midiplay.hpp +++ b/src/adlmidi_midiplay.hpp @@ -156,6 +156,10 @@ public: bool isPercussion; //! Note that plays missing instrument. Doesn't using any chip channels bool isBlank; + //! Whether releasing and on extended life time defined by TTL + bool isOnExtendedLifeTime; + //! Time-to-live until release (short percussion note fix) + double ttl; //! Patch selected const adlinsdata2 *ains; enum diff --git a/src/adlmidi_sequencer.cpp b/src/adlmidi_sequencer.cpp index e8c7a5d..d78815f 100644 --- a/src/adlmidi_sequencer.cpp +++ b/src/adlmidi_sequencer.cpp @@ -141,16 +141,8 @@ double MIDIplay::Tick(double s, double granularity) MidiSequencer &seqr = *m_sequencer; double ret = seqr.Tick(s, granularity); - Synth &synth = *m_synth; s *= seqr.getTempoMultiplier(); - for(uint16_t c = 0; c < synth.m_numChannels; ++c) - m_chipChannels[c].addAge(static_cast<int64_t>(s * 1e6)); - - updateVibrato(s); - updateArpeggio(s); -#if !defined(ADLMIDI_AUDIO_TICK_HANDLER) - updateGlide(s); -#endif + TickIterators(s); return ret; } diff --git a/src/midi_sequencer_impl.hpp b/src/midi_sequencer_impl.hpp index 446e2e7..2af80ea 100644 --- a/src/midi_sequencer_impl.hpp +++ b/src/midi_sequencer_impl.hpp @@ -819,7 +819,7 @@ void BW_MidiSequencer::buildTimeLine(const std::vector<MidiEvent> &tempos, //Resolve "hell of all times" of too short drum notes: //move too short percussion note-offs far far away as possible /********************************************************************************/ -#if 1 //Use this to record WAVEs for comparison before/after implementing of this +#if 0 //Use this to record WAVEs for comparison before/after implementing of this if(m_format == Format_MIDI)//Percussion fix is needed for MIDI only, not for IMF/RSXX or CMF { //! Minimal real time in seconds |