midi_clock_slave: fix wrong calculation of loop error

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

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 677b8c2e3b6f7e3f6fdf5e30cf3d291a35c38511..e74fd7f8ced0327b317debc66578409ac0449a5e 100644 (file)
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -83,7 +83,7 @@ Send::Send (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMas
        boost_debug_shared_ptr_mark_interesting (this, "send");
 
        _amp.reset (new Amp (_session));
-       _meter.reset (new PeakMeter (_session));
+       _meter.reset (new PeakMeter (_session, name()));
 
        add_control (_amp->gain_control ());
 }
@@ -137,9 +137,8 @@ Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframe
 
        /* gain control */
 
-       // Can't automate gain for sends or returns yet because we need different buffers
-       // so that we don't overwrite the main automation data for the route amp
-       // _amp->setup_gain_automation (start_frame, end_frame, nframes);
+       _amp->set_gain_automation_buffer (_session.send_gain_automation_buffer ());
+       _amp->setup_gain_automation (start_frame, end_frame, nframes);
        _amp->run (sendbufs, start_frame, end_frame, nframes, true);
 
        /* deliver to outputs */
@@ -271,7 +270,7 @@ Send::set_state_2X (const XMLNode& node, int /* version */)
 }
 
 bool
-Send::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+Send::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
        /* sends have no impact at all on the channel configuration of the
           streams passing through the route. so, out == in.