extensive changes to PresentationInfo API

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

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index 17a3ca1f421b47dc0acbdd2d866f5286e5739048..1c42993d4fa91247b2cce263507c4f4a58c939d0 100644 (file)
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -40,17 +40,25 @@ using namespace std;
 
 PBD::Signal1<void, pframes_t> InternalSend::CycleStart;
 
-InternalSend::InternalSend (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMaster> mm, boost::shared_ptr<Route> sendto, Delivery::Role role, bool ignore_bitslot)
+InternalSend::InternalSend (Session& s,
+               boost::shared_ptr<Pannable> p,
+               boost::shared_ptr<MuteMaster> mm,
+               boost::shared_ptr<Route> sendfrom,
+               boost::shared_ptr<Route> sendto,
+               Delivery::Role role,
+               bool ignore_bitslot)
        : Send (s, p, mm, role, ignore_bitslot)
+       , _send_from (sendfrom)
 {
-        if (sendto) {
-                if (use_target (sendto)) {
-                        throw failed_constructor();
-                }
-        }
+       if (sendto) {
+               if (use_target (sendto)) {
+                       throw failed_constructor();
+               }
+       }
 
        init_gain ();
 
+       _send_from->DropReferences.connect_same_thread (source_connection, boost::bind (&InternalSend::send_from_going_away, this));
        CycleStart.connect_same_thread (*this, boost::bind (&InternalSend::cycle_start, this, _1));
 }
 
@@ -66,10 +74,10 @@ InternalSend::init_gain ()
 {
        if (_role == Listen) {
                /* send to monitor bus is always at unity */
-               _amp->set_gain (1.0, this);
+               _gain_control->set_value (GAIN_COEFF_UNITY, PBD::Controllable::NoGroup);
        } else {
                /* aux sends start at -inf dB */
-               _amp->set_gain (0, this);
+               _gain_control->set_value (GAIN_COEFF_ZERO, PBD::Controllable::NoGroup);
        }
 }
 
@@ -110,6 +118,12 @@ InternalSend::target_io_changed ()
        reset_panner();
 }
 
+void
+InternalSend::send_from_going_away ()
+{
+       _send_from.reset();
+}
+
 void
 InternalSend::send_to_going_away ()
 {
@@ -134,10 +148,10 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
        } else {
                if (role() == Listen) {
                        /* We're going to the monitor bus, so discard MIDI data */
-                       
+
                        uint32_t const bufs_audio = bufs.count().get (DataType::AUDIO);
                        uint32_t const mixbufs_audio = mixbufs.count().get (DataType::AUDIO);
-                       
+
                        /* monitor-section has same number of channels as master-bus (on creation).
                         *
                         * There is no clear answer what should happen when trying to PFL or AFL
@@ -180,19 +194,18 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
 
                /* target gain has changed */
 
-               Amp::apply_gain (mixbufs, nframes, _current_gain, tgain);
-               _current_gain = tgain;
+               _current_gain = Amp::apply_gain (mixbufs, _session.nominal_frame_rate(), nframes, _current_gain, tgain);
 
-       } else if (tgain == 0.0) {
+       } else if (tgain == GAIN_COEFF_ZERO) {
 
                /* we were quiet last time, and we're still supposed to be quiet.
                */
 
                _meter->reset ();
-               Amp::apply_simple_gain (mixbufs, nframes, 0.0);
+               Amp::apply_simple_gain (mixbufs, nframes, GAIN_COEFF_ZERO);
                goto out;
 
-       } else if (tgain != 1.0) {
+       } else if (tgain != GAIN_COEFF_UNITY) {
 
                /* target gain has not changed, but is not zero or unity */
                Amp::apply_simple_gain (mixbufs, nframes, tgain);
@@ -202,10 +215,12 @@ InternalSend::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame
        _amp->setup_gain_automation (start_frame, end_frame, nframes);
        _amp->run (mixbufs, start_frame, end_frame, nframes, true);
 
+       _delayline->run (mixbufs, start_frame, end_frame, nframes, true);
+
        /* consider metering */
 
        if (_metering) {
-               if (_amp->gain_control()->get_value() == 0) {
+               if (_amp->gain_control()->get_value() == GAIN_COEFF_ZERO) {
                        _meter->reset();
                } else {
                        _meter->run (mixbufs, start_frame, end_frame, nframes, true);
@@ -259,7 +274,7 @@ InternalSend::get_state()
 int
 InternalSend::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        init_gain ();
 
@@ -385,4 +400,4 @@ InternalSend::cycle_start (pframes_t /*nframes*/)
        for (BufferSet::audio_iterator b = mixbufs.audio_begin(); b != mixbufs.audio_end(); ++b) {
                b->prepare ();
        }
-}      
+}