fix invalid mapping detection

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

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 71cab468794bd26e576cc8f2605022d21bcb3176..23ae860f47123fc7f1893d82e83d94cdc096c04d 100644 (file)
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -24,12 +24,14 @@
 #include "pbd/boost_debug.h"
 
 #include "ardour/amp.h"
-#include "ardour/send.h"
-#include "ardour/session.h"
 #include "ardour/buffer_set.h"
-#include "ardour/meter.h"
+#include "ardour/debug.h"
+#include "ardour/gain_control.h"
 #include "ardour/io.h"
+#include "ardour/meter.h"
 #include "ardour/panner_shell.h"
+#include "ardour/send.h"
+#include "ardour/session.h"
 
 #include "i18n.h"
 
@@ -47,7 +49,7 @@ string
 Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot, bool ignore_bitslot)
 {
        if (ignore_bitslot) {
-               /* this happens during initial construction of sends from XML, 
+               /* this happens during initial construction of sends from XML,
                   before they get ::set_state() called. lets not worry about
                   it.
                */
@@ -64,15 +66,17 @@ Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot, bool ignore_b
                return string_compose (_("send %1"), (bitslot = s.next_send_id ()) + 1);
        default:
                fatal << string_compose (_("programming error: send created using role %1"), enum_2_string (r)) << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                return string();
        }
-       
+
 }
 
 Send::Send (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMaster> mm, Role r, bool ignore_bitslot)
        : Delivery (s, p, mm, name_and_id_new_send (s, r, _bitslot, ignore_bitslot), r)
        , _metering (false)
+       , _delay_in (0)
+       , _delay_out (0)
 {
        if (_role == Listen) {
                /* we don't need to do this but it keeps things looking clean
@@ -83,10 +87,14 @@ 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));
+       boost::shared_ptr<AutomationList> gl (new AutomationList (Evoral::Parameter (GainAutomation)));
+       _gain_control = boost::shared_ptr<GainControl> (new GainControl (_session, Evoral::Parameter(GainAutomation), gl));
+       add_control (_gain_control);
+
+       _amp.reset (new Amp (_session, _("Fader"), _gain_control, true));
        _meter.reset (new PeakMeter (_session, name()));
 
-       add_control (_amp->gain_control ());
+       _delayline.reset (new DelayLine (_session, name()));
 
        if (panner_shell()) {
                panner_shell()->Changed.connect_same_thread (*this, boost::bind (&Send::panshell_changed, this));
@@ -117,6 +125,35 @@ Send::deactivate ()
        Processor::deactivate ();
 }
 
+void
+Send::set_delay_in(framecnt_t delay)
+{
+       if (!_delayline) return;
+       if (_delay_in == delay) {
+               return;
+       }
+       _delay_in = delay;
+
+       DEBUG_TRACE (DEBUG::LatencyCompensation,
+                       string_compose ("Send::set_delay_in(%1) + %2 = %3\n",
+                               delay, _delay_out, _delay_out + _delay_in));
+       _delayline.get()->set_delay(_delay_out + _delay_in);
+}
+
+void
+Send::set_delay_out(framecnt_t delay)
+{
+       if (!_delayline) return;
+       if (_delay_out == delay) {
+               return;
+       }
+       _delay_out = delay;
+       DEBUG_TRACE (DEBUG::LatencyCompensation,
+                       string_compose ("Send::set_delay_out(%1) + %2 = %3\n",
+                               delay, _delay_in, _delay_out + _delay_in));
+       _delayline.get()->set_delay(_delay_out + _delay_in);
+}
+
 void
 Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool)
 {
@@ -146,6 +183,8 @@ Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframe
        _amp->setup_gain_automation (start_frame, end_frame, nframes);
        _amp->run (sendbufs, start_frame, end_frame, nframes, true);
 
+       _delayline->run (sendbufs, start_frame, end_frame, nframes, true);
+
        /* deliver to outputs */
 
        Delivery::run (sendbufs, start_frame, end_frame, nframes, true);
@@ -203,7 +242,7 @@ Send::set_state (const XMLNode& node, int version)
                /* don't try to reset bitslot if there is a node for it already: this can cause
                   issues with the session's accounting of send ID's
                */
-               
+
                if ((prop = node.property ("bitslot")) == 0) {
                        if (_role == Delivery::Aux) {
                                _bitslot = _session.next_aux_send_id ();
@@ -228,7 +267,7 @@ Send::set_state (const XMLNode& node, int version)
                        }
                }
        }
-       
+
        XMLNodeList nlist = node.children();
        for (XMLNodeIterator i = nlist.begin(); i != nlist.end(); ++i) {
                if ((*i)->name() == X_("Processor")) {
@@ -301,6 +340,11 @@ Send::configure_io (ChanCount in, ChanCount out)
                return false;
        }
 
+       if (_delayline && !_delayline->configure_io(in, out)) {
+               cerr << "send delayline config failed\n";
+               return false;
+       }
+
        reset_panner ();
 
        return true;
@@ -359,5 +403,3 @@ Send::value_as_string (boost::shared_ptr<AutomationControl> ac) const
 {
        return _amp->value_as_string (ac);
 }
-
-