From beffc7eb7fdee94b5a6065c21571e2590538c6dc Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 8 Feb 2022 21:08:15 -0700 Subject: [PATCH] fix another ordering change introduced during a manual rebase fixup --- libs/ardour/triggerbox.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc index aae5f6390b..73c40a1033 100644 --- a/libs/ardour/triggerbox.cc +++ b/libs/ardour/triggerbox.cc @@ -2300,6 +2300,10 @@ MIDITrigger::midi_run (BufferSet& bufs, samplepos_t start_sample, samplepos_t en ev.scale_velocity (_gain); } + if (_channel_map[ev.channel()] > 0) { + ev.set_channel (_channel_map[ev.channel()]); + } + if (ev.is_pgm_change() || (ev.is_cc() && ((ev.cc_number() == MIDI_CTL_LSB_BANK) || (ev.cc_number() == MIDI_CTL_MSB_BANK)))) { if (_patch_change[ev.channel()].is_set() || _box.ignore_patch_changes ()) { /* skip pgm change info in data because trigger has its own */ @@ -2308,10 +2312,6 @@ MIDITrigger::midi_run (BufferSet& bufs, samplepos_t start_sample, samplepos_t en } } - if (_channel_map[ev.channel()] > 0) { - ev.set_channel (_channel_map[ev.channel()]); - } - DEBUG_TRACE (DEBUG::Triggers, string_compose ("given et %1 TS %7 rs %8 ts %2 bs %3 ss %4 do %5, inserting %6\n", maybe_last_event_timeline_beats, timeline_samples, buffer_samples, start_sample, dest_offset, ev, transition_beats, region_start)); mb->insert_event (ev); }