fix crash when copy'ing latent plugins

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

diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc
index a1374feb8adcb475ebaba1a09bd4f3bbd2b38a84..5c92b9051cb2f0557deb6b6cfdb108b7bc388d18 100644 (file)
--- a/libs/ardour/return.cc
+++ b/libs/ardour/return.cc
@@ -22,30 +22,40 @@
 #include "pbd/xml++.h"
 
 #include "ardour/amp.h"
-#include "ardour/audio_port.h"
+#include "ardour/audioengine.h"
 #include "ardour/buffer_set.h"
+#include "ardour/gain_control.h"
 #include "ardour/io.h"
 #include "ardour/meter.h"
-#include "ardour/panner.h"
-#include "ardour/port.h"
 #include "ardour/return.h"
 #include "ardour/session.h"
-#include "ardour/mute_master.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 
+std::string
+Return::name_and_id_new_return (Session& s, uint32_t& bitslot)
+{
+       bitslot = s.next_return_id();
+       return string_compose (_("return %1"), bitslot + 1);
+}
+
+
 Return::Return (Session& s, bool internal)
        : IOProcessor (s, (internal ? false : true), false,
-                      string_compose (_("return %1"), (_bitslot = s.next_return_id()) + 1))
+                      name_and_id_new_return (s, _bitslot))
        , _metering (false)
 {
        /* never muted */
 
-       _amp.reset (new Amp (_session));
-       _meter.reset (new PeakMeter (_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, X_("Fader"), _gain_control, true));
+       _meter.reset (new PeakMeter (_session, name()));
 }
 
 Return::~Return ()
@@ -76,7 +86,7 @@ Return::set_state (const XMLNode& node, int version)
 {
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        const XMLNode* insert_node = &node;
 
        /* Return has regular IO automation (gain, pan) */
@@ -91,19 +101,21 @@ Return::set_state (const XMLNode& node, int version)
 
        IOProcessor::set_state (*insert_node, version);
 
-       if ((prop = node.property ("bitslot")) == 0) {
-               _bitslot = _session.next_return_id();
-       } else {
-                _session.unmark_return_id (_bitslot);
-               sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
-               _session.mark_return_id (_bitslot);
+       if (!node.property ("ignore-bitslot")) {
+               if ((prop = node.property ("bitslot")) == 0) {
+                       _bitslot = _session.next_return_id();
+               } else {
+                       _session.unmark_return_id (_bitslot);
+                       sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+                       _session.mark_return_id (_bitslot);
+               }
        }
 
        return 0;
 }
 
 void
-Return::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool)
+Return::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool)
 {
        if ((!_active && !_pending_active) || _input->n_ports() == ChanCount::ZERO) {
                return;
@@ -115,13 +127,13 @@ Return::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pfra
        // 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->run (bufs, start_frame, end_frame, nframes, true);
+       _amp->run (bufs, start_frame, end_frame, speed, nframes, true);
 
        if (_metering) {
                if (_amp->gain_control()->get_value() == 0) {
                        _meter->reset();
                } else {
-                       _meter->run (bufs, start_frame, end_frame, nframes, true);
+                       _meter->run (bufs, start_frame, end_frame, speed, nframes, true);
                }
        }
 
@@ -129,7 +141,7 @@ Return::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pfra
 }
 
 bool
-Return::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+Return::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
        out = in + _input->n_ports();
        return true;
@@ -144,7 +156,7 @@ Return::configure_io (ChanCount in, ChanCount out)
 
        // Ensure there are enough buffers (since we add some)
        if (_session.get_scratch_buffers(in).count() < out) {
-               Glib::Mutex::Lock em (_session.engine().process_lock());
+               Glib::Threads::Mutex::Lock em (_session.engine().process_lock());
                IO::PortCountChanged(out);
        }
 
@@ -152,28 +164,3 @@ Return::configure_io (ChanCount in, ChanCount out)
 
        return true;
 }
-
-/** Set up the XML description of a return so that its name is unique.
- *  @param state XML return state.
- *  @param session Session.
- */
-void
-Return::make_unique (XMLNode &state, Session &session)
-{
-       uint32_t const bitslot = session.next_return_id() + 1;
-
-       char buf[32];
-       snprintf (buf, sizeof (buf), "%" PRIu32, bitslot);
-       state.property("bitslot")->set_value (buf);
-
-       std::string const name = string_compose (_("return %1"), bitslot);
-
-       state.property("name")->set_value (name);
-
-       XMLNode* io = state.child ("IO");
-       if (io) {
-               io->property("name")->set_value (name);
-       }
-}
-
-