Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <glibmm/thread.h>
-
-#include "pbd/failed_constructor.h"
+#include <glibmm/threads.h>
#include "ardour/internal_return.h"
-#include "ardour/mute_master.h"
-#include "ardour/session.h"
#include "ardour/internal_send.h"
+#include "ardour/route.h"
using namespace std;
using namespace ARDOUR;
-PBD::Signal1<void, pframes_t> InternalReturn::CycleStart;
-
InternalReturn::InternalReturn (Session& s)
: Return (s, true)
{
- CycleStart.connect_same_thread (*this, boost::bind (&InternalReturn::cycle_start, this, _1));
_display_to_user = false;
}
void
-InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t nframes, bool)
+InternalReturn::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end_sample*/, double /*speed*/, pframes_t nframes, bool)
{
if (!_active && !_pending_active) {
return;
}
- /* _sends is only modified with the process lock held, so this is ok, I think */
+ Glib::Threads::Mutex::Lock lm (_sends_mutex, Glib::Threads::TRY_LOCK);
- for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
- if ((*i)->active ()) {
- bufs.merge_from ((*i)->get_buffers(), nframes);
+ if (lm.locked ()) {
+ for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
+ if ((*i)->active () && (!(*i)->source_route() || (*i)->source_route()->active())) {
+ bufs.merge_from ((*i)->get_buffers(), nframes);
+ }
}
}
_active = _pending_active;
}
-bool
-InternalReturn::configure_io (ChanCount in, ChanCount out)
-{
- IOProcessor::configure_io (in, out);
- allocate_buffers (_session.engine().frames_per_cycle());
- return true;
-}
-
-int
-InternalReturn::set_block_size (pframes_t nframes)
-{
- allocate_buffers (nframes);
- return 0;
-}
-
-void
-InternalReturn::allocate_buffers (pframes_t nframes)
-{
- buffers.ensure_buffers (_configured_input, nframes);
- buffers.set_count (_configured_input);
-}
-
void
InternalReturn::add_send (InternalSend* send)
{
- Glib::Mutex::Lock lm (_session.engine().process_lock());
+ Glib::Threads::Mutex::Lock lm (_sends_mutex);
_sends.push_back (send);
}
void
InternalReturn::remove_send (InternalSend* send)
{
- Glib::Mutex::Lock lm (_session.engine().process_lock());
+ Glib::Threads::Mutex::Lock lm (_sends_mutex);
_sends.remove (send);
}
void
-InternalReturn::cycle_start (pframes_t nframes)
+InternalReturn::set_playback_offset (samplecnt_t cnt)
{
- /* called from process cycle - no lock necessary */
- if (!_sends.empty ()) {
- /* don't bother with this if nobody is going to feed us anything */
- buffers.silence (nframes, 0);
+ Processor::set_playback_offset (cnt);
+
+ Glib::Threads::Mutex::Lock lm (_sends_mutex); // TODO reader lock
+ for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
+ (*i)->set_delay_out (cnt);
}
}
XMLNode&
-InternalReturn::state (bool full)
+InternalReturn::state ()
{
- XMLNode& node (Return::state (full));
+ XMLNode& node (Return::state ());
/* override type */
- node.add_property("type", "intreturn");
+ node.set_property("type", "intreturn");
return node;
}
-XMLNode&
-InternalReturn::get_state()
-{
- return state (true);
-}
-
-int
-InternalReturn::set_state (const XMLNode& node, int version)
+bool
+InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out)
{
- return Return::set_state (node, version);
+ out = in;
+ return true;
}
bool
-InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+InternalReturn::configure_io (ChanCount in, ChanCount out)
{
- out = in;
+ IOProcessor::configure_io (in, out);
return true;
}
-
-