apply gain automation on bounce - fixes 5887

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

diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc
index 80dd7422e9a89d70f1ba4bc1f080235f12cd4db2..29032525f244c57a7d7c94bfb65bfd6c866d62d0 100644 (file)
--- a/libs/ardour/amp.cc
+++ b/libs/ardour/amp.cc
@@ -33,6 +33,10 @@
 
 using namespace ARDOUR;
 using namespace PBD;
+using std::min;
+
+/* gain range of -inf to +6dB, default 0dB */
+const float Amp::max_gain_coefficient = 1.99526231f;
 
 Amp::Amp (Session& s)
        : Processor(s, "Amp")
@@ -42,8 +46,7 @@ Amp::Amp (Session& s)
        , _gain_automation_buffer(0)
 {
        Evoral::Parameter p (GainAutomation);
-       /* gain range of -inf to +6dB, default 0dB */
-       p.set_range (0, 1.99526231f, 1, false);
+       p.set_range (0, max_gain_coefficient, 1, false);
        boost::shared_ptr<AutomationList> gl (new AutomationList (p));
        _gain_control = boost::shared_ptr<GainControl> (new GainControl (X_("gaincontrol"), s, this, p, gl));
        _gain_control->set_flags (Controllable::GainLike);
@@ -58,7 +61,7 @@ Amp::display_name() const
 }
 
 bool
-Amp::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+Amp::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
        out = in;
        return true;
@@ -114,7 +117,7 @@ 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;
                                                if (ev.is_note_on()) {
@@ -172,7 +175,7 @@ Amp::apply_gain (BufferSet& bufs, framecnt_t nframes, gain_t initial, gain_t tar
                        Evoral::MIDIEvent<MidiBuffer::TimeType> ev = *m;
 
                        if (ev.is_note_on()) {
-                               gain_t scale = delta * (ev.time()/(double) nframes);
+                               const gain_t scale = delta * (ev.time()/(double) nframes);
                                ev.scale_velocity (initial+scale);
                        }
                }
@@ -369,22 +372,9 @@ Amp::inc_gain (gain_t factor, void *src)
 }
 
 void
-Amp::set_gain (gain_t val, void *src)
+Amp::set_gain (gain_t val, void *)
 {
-       // max gain at about +6dB (10.0 ^ ( 6 dB * 0.05))
-       if (val > 1.99526231f) {
-               val = 1.99526231f;
-       }
-
-       if (src != _gain_control.get()) {
-               _gain_control->set_value (val);
-               // bit twisty, this will come back and call us again
-               // (this keeps control in sync with reality)
-               return;
-       }
-
-       _gain_control->set_double (val);
-       _session.set_dirty();
+       _gain_control->set_value (val);
 }
 
 XMLNode&
@@ -414,14 +404,8 @@ Amp::set_state (const XMLNode& node, int version)
 void
 Amp::GainControl::set_value (double val)
 {
-       // max gain at about +6dB (10.0 ^ ( 6 dB * 0.05))
-       if (val > 1.99526231) {
-               val = 1.99526231;
-       }
-
-       _amp->set_gain (val, this);
-
-       AutomationControl::set_value(val);
+       AutomationControl::set_value (min (val, (double) max_gain_coefficient));
+       _amp->session().set_dirty ();
 }
 
 double
@@ -449,9 +433,12 @@ Amp::GainControl::internal_to_user (double v) const
 void
 Amp::setup_gain_automation (framepos_t start_frame, framepos_t end_frame, framecnt_t nframes)
 {
-       Glib::Mutex::Lock am (control_lock(), Glib::TRY_LOCK);
+       Glib::Threads::Mutex::Lock am (control_lock(), Glib::Threads::TRY_LOCK);
 
-       if (am.locked() && _session.transport_rolling() && _gain_control->automation_playback()) {
+       if (am.locked()
+           && (_session.transport_rolling() || _session.bounce_processing())
+           && _gain_control->automation_playback())
+       {
                assert (_gain_automation_buffer);
                _apply_gain_automation = _gain_control->list()->curve().rt_safe_get_vector (
                        start_frame, end_frame, _gain_automation_buffer, nframes);