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"
using namespace std;
using namespace ARDOUR;
-PBD::Signal1<void,nframes_t> InternalReturn::CycleStart;
-
InternalReturn::InternalReturn (Session& s)
: Return (s, true)
- , user_count (0)
{
- 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*/, nframes_t nframes, bool)
+InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t nframes, bool)
{
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 */
- return;
+ Glib::Threads::Mutex::Lock lm (_sends_mutex, Glib::Threads::TRY_LOCK);
+
+ if (lm.locked ()) {
+ for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
+ if ((*i)->active ()) {
+ bufs.merge_from ((*i)->get_buffers(), nframes);
+ }
+ }
}
- bufs.merge_from (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 (nframes_t nframes)
-{
- allocate_buffers (nframes);
- return 0;
-}
-
-void
-InternalReturn::allocate_buffers (nframes_t nframes)
-{
- buffers.ensure_buffers (_configured_input, nframes);
- buffers.set_count (_configured_input);
-}
-
-BufferSet*
-InternalReturn::get_buffers ()
-{
- Glib::Mutex::Lock lm (_session.engine().process_lock());
- /* use of g_atomic here is just for code consistency - its protected by the lock
- for writing.
- */
- g_atomic_int_inc (&user_count);
- return &buffers;
-}
-
void
-InternalReturn::release_buffers ()
+InternalReturn::add_send (InternalSend* send)
{
- Glib::Mutex::Lock lm (_session.engine().process_lock());
- if (user_count) {
- /* use of g_atomic here is just for code consistency - its protected by the lock
- for writing.
- */
- (void) g_atomic_int_dec_and_test (&user_count);
- }
+ Glib::Threads::Mutex::Lock lm (_sends_mutex);
+ _sends.push_back (send);
}
void
-InternalReturn::cycle_start (nframes_t nframes)
+InternalReturn::remove_send (InternalSend* send)
{
- /* called from process cycle - no lock necessary */
- if (user_count) {
- /* don't bother with this if nobody is going to feed us anything */
- buffers.silence (nframes, 0);
- }
+ Glib::Threads::Mutex::Lock lm (_sends_mutex);
+ _sends.remove (send);
}
XMLNode&
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;
}
-