carl's wondrous DnD VBox patch - processor boxes are now vboxes and not listviews...

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

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 1728dc52d945bb592fc3ca4cee32f332f5f872e1..91e6827e6166435a2e0e040b46b9813fe9adb27b 100644 (file)
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 
 */
 
+#include <iostream>
 #include <algorithm>
 
 #include "pbd/xml++.h"
@@ -35,6 +36,7 @@
 
 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)
@@ -46,14 +48,14 @@ Send::Send (Session& s, boost::shared_ptr<MuteMaster> mm, Role r)
        ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
-Send::Send (Session& s, boost::shared_ptr<MuteMaster> mm, const XMLNode& node, Role r)
+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)) {
+       if (set_state (node, version)) {
                throw failed_constructor();
        }
 
@@ -79,7 +81,8 @@ Send::deactivate ()
 {
        _amp->deactivate ();
        _meter->deactivate ();
-
+       _meter->reset ();
+       
        Processor::deactivate ();
 }
 
@@ -101,7 +104,7 @@ Send::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_
 
        // we have to copy the input, because deliver_output() may alter the buffers
        // in-place, which a send must never do.
-       
+
        BufferSet& sendbufs = _session.get_mix_buffers (bufs.count());
        sendbufs.read_from (bufs, nframes);
        assert(sendbufs.count() == bufs.count());
@@ -118,7 +121,7 @@ Send::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_
        Delivery::run (sendbufs, start_frame, end_frame, nframes);
 
        /* consider metering */
-       
+
        if (_metering) {
                if (_amp->gain_control()->get_value() == 0) {
                        _meter->reset();
@@ -150,7 +153,7 @@ Send::state(bool full)
 }
 
 int
-Send::set_state(const XMLNode& node)
+Send::set_state (const XMLNode& node, int version)
 {
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
@@ -160,14 +163,15 @@ Send::set_state(const XMLNode& node)
                _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);
        }
 
        const XMLNode* insert_node = &node;
 
        /* XXX need to load automation state & data for amp */
-       
-       Delivery::set_state (*insert_node);
+
+       Delivery::set_state (*insert_node, version);
 
        return 0;
 }
@@ -178,7 +182,7 @@ Send::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
        /* sends have no impact at all on the channel configuration of the
           streams passing through the route. so, out == in.
        */
-       
+
        out = in;
        return true;
 }
@@ -189,8 +193,14 @@ Send::configure_io (ChanCount in, ChanCount out)
        if (!_amp->configure_io (in, out) || !_meter->configure_io (in, out)) {
                return false;
        }
-       
-       return Processor::configure_io (in, out);
+
+       if (!Processor::configure_io (in, out)) {
+               return false;
+       }
+
+       reset_panner ();
+
+       return true;
 }
 
 /** Set up the XML description of a send so that its name is unique.
@@ -206,8 +216,8 @@ Send::make_unique (XMLNode &state, Session &session)
        snprintf (buf, sizeof (buf), "%" PRIu32, bitslot);
        state.property("bitslot")->set_value (buf);
 
-       std::string const name = string_compose (_("send %1"), bitslot);
-       
+       string const name = string_compose (_("send %1"), bitslot);
+
        state.property("name")->set_value (name);
 
        XMLNode* io = state.child ("IO");
@@ -218,15 +228,27 @@ Send::make_unique (XMLNode &state, Session &session)
 }
 
 bool
-Send::set_name (const std::string& new_name)
+Send::set_name (const string& new_name)
 {
-       std::string unique_name;
+       string unique_name;
 
        if (_role == Delivery::Send) {
                char buf[32];
-               snprintf (buf, sizeof (buf), "%u", _bitslot);
-               unique_name = new_name;
+
+               /* rip any existing numeric part of the name, and append the bitslot
+                */
+
+               string::size_type last_letter = new_name.find_last_not_of ("0123456789");
+
+               if (last_letter != string::npos) {
+                       unique_name = new_name.substr (0, last_letter + 1);
+               } else {
+                       unique_name = new_name;
+               }
+
+               snprintf (buf, sizeof (buf), "%u", (_bitslot + 1));
                unique_name += buf;
+
        } else {
                unique_name = new_name;
        }
@@ -235,8 +257,10 @@ Send::set_name (const std::string& new_name)
 }
 
 bool
-Send::visible () const
+Send::display_to_user () const
 {
+       /* we ignore Deliver::_display_to_user */
+
        if (_role == Listen) {
                return false;
        }