ardour/livetrax
13
0
Fork 0
Code

Fix MIDI velocity scale for muted sends and manual faders

Browse Source 
Do not send continuous stream of note-evens with zero velocity
after muting a MIDI track or after a fade to silence completed
(and all-notes-off has been sent).

NB. Automated Faders are left untouched (no panic is sent for -infdB gain),
Note-on events with zero velocity are sent.
This commit is contained in:
Robin Gareus 2019-09-09 05:01:26 +02:00
parent 65268bae5b
commit cd6e074e92
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libs/ardour/amp.cc
View File

@ -148,25 +148,8 @@ Amp::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end_sampl
} else if (target_gain != GAIN_COEFF_UNITY) {
_current_gain = target_gain;
apply_simple_gain (bufs, nframes, _current_gain, _midi_amp);
if (_midi_amp) {
/* don't Trim midi velocity -- only relevant for Midi on Audio tracks */
for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) {
MidiBuffer& mb (*i);
for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
Evoral::Event<MidiBuffer::TimeType> ev = *m;
if (ev.is_note_on()) {
scale_midi_velocity (ev, fabsf (_current_gain));
}
}
}
}
for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) {
apply_gain_to_buffer (i->data(), nframes, _current_gain);
}
} else {
/* unity target gain */
_current_gain = target_gain;
@ -232,13 +215,19 @@ Amp::apply_gain (BufferSet& bufs, samplecnt_t sample_rate, samplecnt_t nframes,
MidiBuffer& mb (*i);
for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ) {
Evoral::Event<MidiBuffer::TimeType> ev = *m;
if (ev.is_note_on()) {
const gain_t scale = delta * (ev.time() / (double) nframes);
scale_midi_velocity (ev, fabsf (initial + scale));
if (ev.is_note_on() || ev.is_note_off()) {
const gain_t scale = fabsf (initial + delta * (ev.time() / (double) nframes));
if (scale < GAIN_COEFF_SMALL) {
m = mb.erase (m);
continue;
} else if (ev.is_note_on()) {
scale_midi_velocity (ev, scale);
}
}
++m;
}
/* queue MIDI all-note-off when going silent */