/*
- Copyright (C) 2009 Paul Davis
+ Copyright (C) 2009 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
using namespace std;
using namespace ARDOUR;
-sigc::signal<void,nframes_t> InternalReturn::CycleStart;
+PBD::Signal1<void,nframes_t> InternalReturn::CycleStart;
InternalReturn::InternalReturn (Session& s)
: Return (s, true)
, user_count (0)
{
- CycleStart.connect (mem_fun (*this, &InternalReturn::cycle_start));
+ CycleStart.connect_same_thread (*this, boost::bind (&InternalReturn::cycle_start, this, _1));
}
InternalReturn::InternalReturn (Session& s, const XMLNode& node)
: Return (s, node, true)
, user_count (0)
{
- CycleStart.connect (mem_fun (*this, &InternalReturn::cycle_start));
+ CycleStart.connect_same_thread (*this, boost::bind (&InternalReturn::cycle_start, this, _1));
}
void
-InternalReturn::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
+InternalReturn::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes, bool)
{
- /* XXX no lock here, just atomic fetch */
+ if (!_active && !_pending_active) {
+ return;
+ }
+
+ /* no lock here, just atomic fetch */
if (g_atomic_int_get(&user_count) == 0) {
/* nothing to do - nobody is feeding us anything */
}
bufs.merge_from (buffers, nframes);
+ _active = _pending_active;
}
bool
return true;
}
-void
+void
InternalReturn::set_block_size (nframes_t nframes)
{
allocate_buffers (nframes);
}
int
-InternalReturn::set_state (const XMLNode& node)
+InternalReturn::set_state (const XMLNode& node, int version)
{
- return Return::set_state (node);
+ return Return::set_state (node, version);
}
-bool
+bool
InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
{
out = in;
return true;
}
-
-
+bool
+InternalReturn::visible () const
+{
+ return false;
+}