X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Freturn.cc;h=74b1cbeb32e4295045b6442fb54b252d4f2fb3fb;hb=84272b4e27e537bf2c38c9cd25675c61addea40a;hp=858d658c9c2b07e43d6a5b0738e854031619058b;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc index 858d658c9c..74b1cbeb32 100644 --- a/libs/ardour/return.cc +++ b/libs/ardour/return.cc @@ -22,86 +22,62 @@ #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 "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; -Return::Return (Session& s, bool internal) - : IOProcessor (s, (internal ? false : true), false, - string_compose (_("return %1"), (_bitslot = s.next_return_id()) + 1)) - , _metering (false) +std::string +Return::name_and_id_new_return (Session& s, uint32_t& bitslot) { - /* never muted */ - - _amp.reset (new Amp (_session, boost::shared_ptr())); - _meter.reset (new PeakMeter (_session)); - - ProcessorCreated (this); /* EMIT SIGNAL */ + bitslot = s.next_return_id(); + return string_compose (_("return %1"), bitslot + 1); } -Return::Return (Session& s, const XMLNode& node, bool internal) - : IOProcessor (s, (internal ? false : true), false, "return") + +Return::Return (Session& s, bool internal) + : IOProcessor (s, (internal ? false : true), false, + name_and_id_new_return (s, _bitslot)) , _metering (false) { /* never muted */ - _amp.reset (new Amp (_session, boost::shared_ptr())); - _meter.reset (new PeakMeter (_session)); + boost::shared_ptr gl (new AutomationList (Evoral::Parameter (GainAutomation))); + _gain_control = boost::shared_ptr (new GainControl (_session, Evoral::Parameter (GainAutomation), gl)); + add_control (_gain_control); - if (set_state (node)) { - throw failed_constructor(); - } - - ProcessorCreated (this); /* EMIT SIGNAL */ + _amp.reset (new Amp (_session, X_("Fader"), _gain_control, true)); + _meter.reset (new PeakMeter (_session, name())); } Return::~Return () { - GoingAway (); -} - -XMLNode& -Return::get_state(void) -{ - return state (true); + _session.unmark_return_id (_bitslot); } XMLNode& -Return::state(bool full) +Return::state() { - XMLNode& node = IOProcessor::state(full); - char buf[32]; - node.add_property ("type", "return"); - snprintf (buf, sizeof (buf), "%" PRIu32, _bitslot); - node.add_property ("bitslot", buf); + XMLNode& node = IOProcessor::state (); + node.set_property ("type", "return"); + node.set_property ("bitslot", _bitslot); return node; } int -Return::set_state(const XMLNode& node) +Return::set_state (const XMLNode& node, int version) { XMLNodeList nlist = node.children(); XMLNodeIterator niter; - const XMLProperty* prop; - - if ((prop = node.property ("bitslot")) == 0) { - _bitslot = _session.next_return_id(); - } else { - sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot); - _session.mark_return_id (_bitslot); - } - const XMLNode* insert_node = &node; /* Return has regular IO automation (gain, pan) */ @@ -114,13 +90,24 @@ Return::set_state(const XMLNode& node) } } - IOProcessor::set_state (*insert_node); + IOProcessor::set_state (*insert_node, version); + + if (!node.property ("ignore-bitslot")) { + uint32_t bitslot; + if (node.get_property ("bitslot", bitslot)) { + _session.unmark_return_id (_bitslot); + _bitslot = bitslot; + _session.mark_return_id (_bitslot); + } else { + _bitslot = _session.next_return_id(); + } + } return 0; } void -Return::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes) +Return::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool) { if ((!_active && !_pending_active) || _input->n_ports() == ChanCount::ZERO) { return; @@ -131,14 +118,14 @@ Return::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframe // 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); + // _amp->setup_gain_automation (start_sample, end_sample, nframes); + _amp->run (bufs, start_sample, end_sample, speed, nframes, true); if (_metering) { if (_amp->gain_control()->get_value() == 0) { _meter->reset(); } else { - _meter->run (bufs, start_frame, end_frame, nframes); + _meter->run (bufs, start_sample, end_sample, speed, nframes, true); } } @@ -146,7 +133,7 @@ Return::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframe } 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; @@ -161,7 +148,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); } @@ -169,28 +156,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); - } -} - -