#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"
-#include "ardour/mute_master.h"
-#include "ardour/audioengine.h"
#include "i18n.h"
/* never muted */
_amp.reset (new Amp (_session));
- _meter.reset (new PeakMeter (_session));
-}
-
-Return::Return (Session& s, const std::string& name, uint32_t bslot, bool internal)
- : IOProcessor (s, (internal ? false : true), false, name)
- , _metering (false)
- , _bitslot (bslot)
-{
- /* never muted */
-
- _amp.reset (new Amp (_session));
- _meter.reset (new PeakMeter (_session));
+ _meter.reset (new PeakMeter (_session, name()));
}
Return::~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 we will not
- * reset its name or bitslot during ::set_state()
- * @param state XML return state.
- */
-void
-Return::make_unique (XMLNode &state)
-{
- state.add_property ("ignore-bitslot", "1");
- state.add_property ("ignore-name", "1");
-}
-
-