X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsend.cc;h=e4fbf3efba6bb5bf11ce6d6534146bb780a0d8fa;hb=7d96960b162d25da87c388a3083775e8770bba56;hp=a90f31c2cf6671607de6d289c0b664a3df5089bf;hpb=3b7230552d8aa6c36fd2fbc3ccc1cfb9109fc843;p=ardour.git diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index a90f31c2cf..e4fbf3efba 100644 --- 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 #include #include "pbd/xml++.h" @@ -35,6 +36,7 @@ using namespace ARDOUR; using namespace PBD; +using namespace std; Send::Send (Session& s, boost::shared_ptr 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 mm, Role r) ProcessorCreated (this); /* EMIT SIGNAL */ } -Send::Send (Session& s, boost::shared_ptr mm, const XMLNode& node, Role r) +Send::Send (Session& s, boost::shared_ptr 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(); } @@ -62,7 +64,6 @@ Send::Send (Session& s, boost::shared_ptr mm, const XMLNode& node, R Send::~Send () { - GoingAway (); } void @@ -79,12 +80,13 @@ Send::deactivate () { _amp->deactivate (); _meter->deactivate (); - + _meter->reset (); + Processor::deactivate (); } void -Send::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes) +Send::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool) { if (_output->n_ports() == ChanCount::ZERO) { _meter->reset (); @@ -101,7 +103,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()); @@ -111,19 +113,19 @@ Send::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_ // 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 (sendbufs, start_frame, end_frame, nframes); + _amp->run (sendbufs, start_frame, end_frame, nframes, true); /* deliver to outputs */ - Delivery::run (sendbufs, start_frame, end_frame, nframes); + Delivery::run (sendbufs, start_frame, end_frame, nframes, true); /* consider metering */ - + if (_metering) { if (_amp->gain_control()->get_value() == 0) { _meter->reset(); } else { - _meter->run (*_output_buffers, start_frame, end_frame, nframes); + _meter->run (*_output_buffers, start_frame, end_frame, nframes, true); } } @@ -150,7 +152,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 +162,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 +181,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,13 +192,13 @@ Send::configure_io (ChanCount in, ChanCount out) if (!_amp->configure_io (in, out) || !_meter->configure_io (in, out)) { return false; } - + if (!Processor::configure_io (in, out)) { return false; } reset_panner (); - + return true; } @@ -212,8 +215,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"); @@ -224,15 +227,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; } @@ -241,8 +256,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; }