ardour/livetrax
13
0
Fork 0
Code

take process lock in global port matrix' set_state() method; use namespace ARDOUR too

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8105 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-11-27 16:41:28 +00:00
parent 7df2aa24c9
commit 30d64f31ac
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk2_ardour/global_port_matrix.cc
View File

@ -30,8 +30,9 @@
#include "i18n.h" #include "i18n.h"
using namespace std; using namespace std;
using namespace ARDOUR;
GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, ARDOUR::Session* s, ARDOUR::DataType t) GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, Session* s, DataType t)
: PortMatrix (p, s, t) : PortMatrix (p, s, t)
{ {
setup_all_ports (); setup_all_ports ();
@ -47,16 +48,18 @@ GlobalPortMatrix::setup_ports (int dim)
} }
void void
GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s) GlobalPortMatrix::set_state (BundleChannel c[2], bool s)
{ {
ARDOUR::Bundle::PortList const & in_ports = c[IN].bundle->channel_ports (c[IN].channel); Bundle::PortList const & in_ports = c[IN].bundle->channel_ports (c[IN].channel);
ARDOUR::Bundle::PortList const & out_ports = c[OUT].bundle->channel_ports (c[OUT].channel); Bundle::PortList const & out_ports = c[OUT].bundle->channel_ports (c[OUT].channel);
for (ARDOUR::Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) { Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock());
for (ARDOUR::Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
ARDOUR::Port* p = _session->engine().get_port_by_name (*i); for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
ARDOUR::Port* q = _session->engine().get_port_by_name (*j); for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
Port* p = _session->engine().get_port_by_name_locked (*i);
Port* q = _session->engine().get_port_by_name_locked (*j);
if (p) { if (p) {
if (s) { if (s) {
@ -83,25 +86,25 @@ GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s)
} }
PortMatrixNode::State PortMatrixNode::State
GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const GlobalPortMatrix::get_state (BundleChannel c[2]) const
{ {
if (_session == 0) { if (_session == 0) {
return PortMatrixNode::NOT_ASSOCIATED; return PortMatrixNode::NOT_ASSOCIATED;
} }
ARDOUR::Bundle::PortList const & in_ports = c[IN].bundle->channel_ports (c[IN].channel); Bundle::PortList const & in_ports = c[IN].bundle->channel_ports (c[IN].channel);
ARDOUR::Bundle::PortList const & out_ports = c[OUT].bundle->channel_ports (c[OUT].channel); Bundle::PortList const & out_ports = c[OUT].bundle->channel_ports (c[OUT].channel);
if (in_ports.empty() || out_ports.empty()) { if (in_ports.empty() || out_ports.empty()) {
/* we're looking at a bundle with no parts associated with this channel, /* we're looking at a bundle with no parts associated with this channel,
so nothing to connect */ so nothing to connect */
return PortMatrixNode::NOT_ASSOCIATED; return PortMatrixNode::NOT_ASSOCIATED;
} }
for (ARDOUR::Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) { for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
for (ARDOUR::Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) { for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
ARDOUR::Port* p = _session->engine().get_port_by_name (*i); Port* p = _session->engine().get_port_by_name (*i);
ARDOUR::Port* q = _session->engine().get_port_by_name (*j); Port* q = _session->engine().get_port_by_name (*j);
if (!p && !q) { if (!p && !q) {
/* two non-Ardour ports; things are slightly more involved */ /* two non-Ardour ports; things are slightly more involved */
@ -142,14 +145,14 @@ GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const
return PortMatrixNode::ASSOCIATED; return PortMatrixNode::ASSOCIATED;
} }
GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session* s, ARDOUR::DataType t) GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t)
: _port_matrix (this, s, t) : _port_matrix (this, s, t)
{ {
switch (t) { switch (t) {
case ARDOUR::DataType::AUDIO: case DataType::AUDIO:
set_title (_("Audio Connection Manager")); set_title (_("Audio Connection Manager"));
break; break;
case ARDOUR::DataType::MIDI: case DataType::MIDI:
set_title (_("MIDI Connection Manager")); set_title (_("MIDI Connection Manager"));
break; break;
} }
@ -167,7 +170,7 @@ GlobalPortMatrixWindow::on_show ()
} }
void void
GlobalPortMatrixWindow::set_session (ARDOUR::Session* s) GlobalPortMatrixWindow::set_session (Session* s)
{ {
_port_matrix.set_session (s); _port_matrix.set_session (s);
} }