harden TempoMap::next_tempo_section () a bit.

[ardour.git] / libs / ardour / amp.cc

diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc
index e4223e458613f36f4a3b0297264f79c35d596539..46af91bf05d30462d990994444af84950120f6c3 100644 (file)
--- a/libs/ardour/amp.cc
+++ b/libs/ardour/amp.cc
@@ -31,7 +31,7 @@
 #include "ardour/rc_configuration.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -70,6 +70,13 @@ Amp::configure_io (ChanCount in, ChanCount out)
        return Processor::configure_io (in, out);
 }
 
+static void
+scale_midi_velocity(Evoral::Event<MidiBuffer::TimeType>& ev, float factor)
+{
+       factor = std::max(factor, 0.0f);
+       ev.set_velocity(std::min(127L, lrintf(ev.velocity() * factor)));
+}
+
 void
 Amp::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, double /*speed*/, pframes_t nframes, bool)
 {
@@ -88,10 +95,10 @@ Amp::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/,
                                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::MIDIEvent<MidiBuffer::TimeType> ev = *m;
+                                               Evoral::Event<MidiBuffer::TimeType> ev = *m;
                                                if (ev.is_note_on()) {
                                                        assert(ev.time() >= 0 && ev.time() < nframes);
-                                                       ev.scale_velocity (fabsf (gab[ev.time()]));
+                                                       scale_midi_velocity (ev, fabsf (gab[ev.time()]));
                                                }
                                        }
                                }
@@ -135,9 +142,9 @@ Amp::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/,
                                                MidiBuffer& mb (*i);
 
                                                for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
-                                                       Evoral::MIDIEvent<MidiBuffer::TimeType> ev = *m;
+                                                       Evoral::Event<MidiBuffer::TimeType> ev = *m;
                                                        if (ev.is_note_on()) {
-                                                               ev.scale_velocity (fabsf (_current_gain));
+                                                               scale_midi_velocity (ev, fabsf (_current_gain));
                                                        }
                                                }
                                        }
@@ -186,11 +193,11 @@ Amp::apply_gain (BufferSet& bufs, framecnt_t sample_rate, framecnt_t nframes, ga
                        MidiBuffer& mb (*i);
 
                        for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
-                               Evoral::MIDIEvent<MidiBuffer::TimeType> ev = *m;
+                               Evoral::Event<MidiBuffer::TimeType> ev = *m;
 
                                if (ev.is_note_on()) {
                                        const gain_t scale = delta * (ev.time()/(double) nframes);
-                                       ev.scale_velocity (fabsf (initial+scale));
+                                       scale_midi_velocity (ev, fabsf (initial + scale));
                                }
                        }
                }
@@ -304,7 +311,7 @@ Amp::apply_simple_gain (BufferSet& bufs, framecnt_t nframes, gain_t target, bool
                                MidiBuffer& mb (*i);
 
                                for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
-                                       Evoral::MIDIEvent<MidiBuffer::TimeType> ev = *m;
+                                       Evoral::Event<MidiBuffer::TimeType> ev = *m;
                                        if (ev.is_note_on()) {
                                                ev.set_velocity (0);
                                        }
@@ -324,9 +331,9 @@ Amp::apply_simple_gain (BufferSet& bufs, framecnt_t nframes, gain_t target, bool
                                MidiBuffer& mb (*i);
 
                                for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
-                                       Evoral::MIDIEvent<MidiBuffer::TimeType> ev = *m;
+                                       Evoral::Event<MidiBuffer::TimeType> ev = *m;
                                        if (ev.is_note_on()) {
-                                               ev.scale_velocity (fabsf (target));
+                                               scale_midi_velocity(ev, fabsf (target));
                                        }
                                }
                        }
@@ -388,6 +395,21 @@ Amp::setup_gain_automation (framepos_t start_frame, framepos_t end_frame, framec
                assert (_gain_automation_buffer);
                _apply_gain_automation = _gain_control->list()->curve().rt_safe_get_vector (
                        start_frame, end_frame, _gain_automation_buffer, nframes);
+
+               /* XXX the future requires a way to automate the control master
+                * and merge its own automation vector/curve with this one. We
+                * don't have a way to do that just yet, so for now, just get
+                * the master's current gain and scale our own automation
+                * vector/curve by this value.
+                */
+
+               if (_gain_control->slaved()) {
+                       const double master_gain = _gain_control->get_masters_value ();
+                       if (master_gain != 1.0) {
+                               apply_gain_to_buffer (_gain_automation_buffer, nframes, master_gain);
+                       }
+               }
+
                if (start_frame != _current_automation_frame && _session.bounce_processing ()) {
                        _current_gain = _gain_automation_buffer[0];
                }