diff options
author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-08-31 03:55:58 +0300 |
---|---|---|
committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-08-31 03:55:58 +0300 |
commit | 6faa5b52cf5a0c41579f9720c947c8d3bbc9d08c (patch) | |
tree | 6d5d28788bd719e6439976cd4716673bc74bc654 /src/midi_sequencer_impl.hpp | |
parent | 4c7f23f8999c7f5d71071d0b94fc18effeb0a9eb (diff) | |
parent | d8b894af640bd1e2b1115bd69c29b4654b3c6973 (diff) | |
download | libADLMIDI-6faa5b52cf5a0c41579f9720c947c8d3bbc9d08c.tar.gz libADLMIDI-6faa5b52cf5a0c41579f9720c947c8d3bbc9d08c.tar.bz2 libADLMIDI-6faa5b52cf5a0c41579f9720c947c8d3bbc9d08c.zip |
Merge branch 'master' into stable
Diffstat (limited to 'src/midi_sequencer_impl.hpp')
-rw-r--r-- | src/midi_sequencer_impl.hpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/midi_sequencer_impl.hpp b/src/midi_sequencer_impl.hpp index 0fe6192..e54c7ee 100644 --- a/src/midi_sequencer_impl.hpp +++ b/src/midi_sequencer_impl.hpp @@ -614,6 +614,19 @@ bool BW_MidiSequencer::buildSmfTrackData(const std::vector<std::vector<uint8_t> } } +#ifdef ENABLE_END_SILENCE_SKIPPING + //Have track end on its own row? Clear any delay on the row before + if(event.subtype == MidiEvent::ST_ENDTRACK && evtPos.events.size() == 1) + { + if (!m_trackData[tk].empty()) + { + MidiTrackRow &previous = m_trackData[tk].back(); + previous.delay = 0; + previous.timeDelay = 0; + } + } +#endif + if((evtPos.delay > 0) || (event.subtype == MidiEvent::ST_ENDTRACK)) { evtPos.absPos = abs_position; |