fix merge conflicts with audioengine

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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index 27e219dd221d95590703993fba19275cb23b4d1e..8136985e1f678273536c2d8e51b4a71fa5a791b3 100644 (file)
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -25,7 +25,6 @@
 #include "ardour/internal_return.h"
 #include "ardour/internal_send.h"
 #include "ardour/meter.h"
-#include "ardour/panner.h"
 #include "ardour/panner_shell.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
@@ -33,6 +32,8 @@
 
 #include "i18n.h"
 
+namespace ARDOUR { class MuteMaster; class Pannable; }
+
 using namespace PBD;
 using namespace ARDOUR;
 using namespace std;
@@ -175,10 +176,8 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
                Amp::apply_simple_gain (mixbufs, nframes, tgain);
        }
 
-       // 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 (mixbufs, start_frame, end_frame, nframes, true);
 
        /* consider metering */
@@ -276,7 +275,8 @@ InternalSend::connect_when_legal ()
         boost::shared_ptr<Route> sendto;
 
        if ((sendto = _session.route_by_id (_send_to_id)) == 0) {
-               error << X_("cannot find route to connect to") << endmsg;
+               error << string_compose (_("%1 - cannot find any track/bus with the ID %2 to connect to"), display_name(), _send_to_id) << endmsg;
+               cerr << string_compose (_("%1 - cannot find any track/bus with the ID %2 to connect to"), display_name(), _send_to_id) << endl;
                return -1;
        }
 
@@ -284,7 +284,7 @@ InternalSend::connect_when_legal ()
 }
 
 bool
-InternalSend::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+InternalSend::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
        out = in;
        return true;
@@ -310,7 +310,7 @@ bool
 InternalSend::configure_io (ChanCount in, ChanCount out)
 {
        bool ret = Send::configure_io (in, out);
-       set_block_size (_session.engine().frames_per_cycle());
+       set_block_size (_session.engine().samples_per_cycle());
        return ret;
 }
 
@@ -358,7 +358,7 @@ InternalSend::set_can_pan (bool yn)
 }
 
 void
-InternalSend::cycle_start (pframes_t nframes)
+InternalSend::cycle_start (pframes_t /*nframes*/)
 {
        for (BufferSet::audio_iterator b = mixbufs.audio_begin(); b != mixbufs.audio_end(); ++b) {
                b->prepare ();