ardour/libs/ardour/internal_return.cc
Carl Hetherington ca1de50004 Give the _sends member of InternalReturn its own mutex,
rather than using the process lock to protect it.  Prevents
a deadlock when removing an aux send causes it to remove
itself from its return (#4712).


git-svn-id: svn://localhost/ardour2/branches/3.0@11760 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-25 20:30:26 +00:00

100 lines
2.3 KiB
C++

/*
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
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <glibmm/thread.h>
#include "pbd/failed_constructor.h"
#include "ardour/audio_buffer.h"
#include "ardour/internal_return.h"
#include "ardour/mute_master.h"
#include "ardour/session.h"
#include "ardour/internal_send.h"
#include "ardour/audioengine.h"
using namespace std;
using namespace ARDOUR;
InternalReturn::InternalReturn (Session& s)
: Return (s, true)
{
_display_to_user = false;
}
void
InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t nframes, bool)
{
if (!_active && !_pending_active) {
return;
}
Glib::Mutex::Lock lm (_sends_mutex, Glib::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);
}
}
}
_active = _pending_active;
}
void
InternalReturn::add_send (InternalSend* send)
{
Glib::Mutex::Lock lm (_sends_mutex);
_sends.push_back (send);
}
void
InternalReturn::remove_send (InternalSend* send)
{
Glib::Mutex::Lock lm (_sends_mutex);
_sends.remove (send);
}
XMLNode&
InternalReturn::state (bool full)
{
XMLNode& node (Return::state (full));
/* override type */
node.add_property("type", "intreturn");
return node;
}
XMLNode&
InternalReturn::get_state()
{
return state (true);
}
bool
InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
{
out = in;
return true;
}
bool
InternalReturn::configure_io (ChanCount in, ChanCount out)
{
IOProcessor::configure_io (in, out);
return true;
}