#include "pbd/xml++.h"
#include "ardour/amp.h"
-#include "ardour/audio_port.h"
+#include "ardour/audioengine.h"
#include "ardour/buffer_set.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"
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, boost::shared_ptr<MuteMaster>()));
- _meter.reset (new PeakMeter (_session));
+ _amp.reset (new Amp (_session));
+ _meter.reset (new PeakMeter (_session, name()));
}
Return::~Return ()
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, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool)
+Return::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool)
{
if ((!_active && !_pending_active) || _input->n_ports() == ChanCount::ZERO) {
return;
}
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;
// 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);
}
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);
- }
-}
-
-