do not offer combine operation for MIDI (see comment in libs/ardour/midi_playlist_sou...

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

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 89a66afa465a5fd15fb4c1999a19160fc16d9517..2ec9a10bda6df85e3796dfc050433feb2ec8a57f 100644 (file)
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -38,32 +38,17 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace std;
 
-Send::Send (Session& s, boost::shared_ptr<MuteMaster> mm, Role r)
-       : Delivery (s, mm, string_compose (_("send %1"), (_bitslot = s.next_send_id()) + 1), r)
+Send::Send (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMaster> mm, Role r)
+       : Delivery (s, p, mm, string_compose (_("send %1"), (_bitslot = s.next_send_id()) + 1), r)
        , _metering (false)
 {
-       _amp.reset (new Amp (_session, _mute_master));
+       _amp.reset (new Amp (_session));
        _meter.reset (new PeakMeter (_session));
-
-       ProcessorCreated (this); /* EMIT SIGNAL */
-}
-
-Send::Send (Session& s, boost::shared_ptr<MuteMaster> mm, const XMLNode& node, int version, Role r)
-        : Delivery (s, mm, "send", r)
-       , _metering (false)
-{
-       _amp.reset (new Amp (_session, _mute_master));
-       _meter.reset (new PeakMeter (_session));
-
-       if (set_state (node, version)) {
-               throw failed_constructor();
-       }
-
-       ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 Send::~Send ()
 {
+        _session.unmark_send_id (_bitslot);
 }
 
 void
@@ -86,7 +71,7 @@ Send::deactivate ()
 }
 
 void
-Send::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool)
+Send::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool)
 {
        if (_output->n_ports() == ChanCount::ZERO) {
                _meter->reset ();
@@ -139,7 +124,7 @@ Send::get_state(void)
 }
 
 XMLNode&
-Send::state(bool full)
+Send::state (bool full)
 {
        XMLNode& node = Delivery::state(full);
        char buf[32];
@@ -148,29 +133,75 @@ Send::state(bool full)
        snprintf (buf, sizeof (buf), "%" PRIu32, _bitslot);
        node.add_property ("bitslot", buf);
 
+       node.add_child_nocopy (_amp->state (full));
+
        return node;
 }
 
 int
 Send::set_state (const XMLNode& node, int version)
 {
-       XMLNodeList nlist = node.children();
-       XMLNodeIterator niter;
+       if (version < 3000) {
+               return set_state_2X (node, version);
+       }
+       
        const XMLProperty* prop;
 
-       if ((prop = node.property ("bitslot")) == 0) {
-               _bitslot = _session.next_send_id();
-       } else {
-               sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
-               cerr << this << " scanned " << prop->value() << " to get " << _bitslot << endl;
-               _session.mark_send_id (_bitslot);
+       Delivery::set_state (node, version);
+
+        /* don't try to reset bitslot if its already set: this can cause
+           issues with the session's accounting of send ID's
+        */
+
+        if ((prop = node.property ("bitslot")) == 0) {
+                _bitslot = _session.next_send_id();
+        } else {
+                _session.unmark_send_id (_bitslot);
+                sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
+                _session.mark_send_id (_bitslot);
+        }
+
+       XMLNodeList nlist = node.children();
+       for (XMLNodeIterator i = nlist.begin(); i != nlist.end(); ++i) {
+               if ((*i)->name() == X_("Processor")) {
+                       _amp->set_state (**i, version);
+               }
        }
 
-       const XMLNode* insert_node = &node;
+       return 0;
+}
 
-       /* XXX need to load automation state & data for amp */
+int
+Send::set_state_2X (const XMLNode& node, int /* version */)
+{
+       /* use the IO's name for the name of the send */
+       XMLNodeList const & children = node.children ();
 
-       Delivery::set_state (*insert_node, version);
+       XMLNodeList::const_iterator i = children.begin();
+       while (i != children.end() && (*i)->name() != X_("Redirect")) {
+               ++i;
+       }
+
+       if (i == children.end()) {
+               return -1;
+       }
+
+       XMLNodeList const & grand_children = (*i)->children ();
+       XMLNodeList::const_iterator j = grand_children.begin ();
+       while (j != grand_children.end() && (*j)->name() != X_("IO")) {
+               ++j;
+       }
+
+       if (j == grand_children.end()) {
+               return -1;
+       }
+
+       XMLProperty const * prop = (*j)->property (X_("name"));
+       if (!prop) {
+               return -1;
+       }
+
+       set_name (prop->value ());
 
        return 0;
 }
@@ -186,6 +217,7 @@ Send::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
        return true;
 }
 
+/** Caller must hold process lock */
 bool
 Send::configure_io (ChanCount in, ChanCount out)
 {
@@ -260,9 +292,10 @@ Send::display_to_user () const
 {
        /* we ignore Deliver::_display_to_user */
 
-//     if (_role == Listen || _role == MainListen) {
-//             return false;
-//     }
+       if (_role == Listen) {
+                /* don't make the monitor/control/listen send visible */
+               return false;
+       }
 
        return true;
 }