X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fglobal_port_matrix.cc;h=318263a9cde4ce5e37407d171ad047f77799f9b0;hb=92a5e4da48b85017647fb2c55d2d76fff47243e1;hp=72a2a6b6d70ba164cae7846bdcce2789195d7709;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc index 72a2a6b6d7..318263a9cd 100644 --- a/gtk2_ardour/global_port_matrix.cc +++ b/gtk2_ardour/global_port_matrix.cc @@ -30,32 +30,34 @@ #include "i18n.h" 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) { setup_all_ports (); + init (); } void GlobalPortMatrix::setup_ports (int dim) { _ports[dim].suspend_signals (); - _ports[dim].gather (_session, dim == IN); + _ports[dim].gather (_session, type(), dim == IN, false); _ports[dim].resume_signals (); } 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); - ARDOUR::Bundle::PortList const & out_ports = c[OUT].bundle->channel_ports (c[OUT].channel); + Bundle::PortList const & in_ports = c[IN].bundle->channel_ports (c[IN].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) { - for (ARDOUR::Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) { + for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) { + for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) { - ARDOUR::Port* p = _session.engine().get_port_by_name (*i); - ARDOUR::Port* q = _session.engine().get_port_by_name (*j); + Port* p = _session->engine().get_port_by_name (*i); + Port* q = _session->engine().get_port_by_name (*j); if (p) { if (s) { @@ -69,33 +71,64 @@ GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s) } else { q->disconnect (*i); } + } else { + /* two non-Ardour ports */ + if (s) { + jack_connect (_session->engine().jack (), j->c_str(), i->c_str()); + } else { + jack_disconnect (_session->engine().jack (), j->c_str(), i->c_str()); + } } - - /* we don't handle connections between two non-Ardour ports */ } } } PortMatrixNode::State -GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const +GlobalPortMatrix::get_state (BundleChannel c[2]) const { - ARDOUR::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); + if (_session == 0) { + return PortMatrixNode::NOT_ASSOCIATED; + } + + Bundle::PortList const & in_ports = c[IN].bundle->channel_ports (c[IN].channel); + Bundle::PortList const & out_ports = c[OUT].bundle->channel_ports (c[OUT].channel); if (in_ports.empty() || out_ports.empty()) { /* we're looking at a bundle with no parts associated with this channel, so nothing to connect */ - return PortMatrixNode::UNKNOWN; + return PortMatrixNode::NOT_ASSOCIATED; } - for (ARDOUR::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 i = in_ports.begin(); i != in_ports.end(); ++i) { + for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) { - ARDOUR::Port* p = _session.engine().get_port_by_name (*i); - ARDOUR::Port* q = _session.engine().get_port_by_name (*j); + Port* p = _session->engine().get_port_by_name (*i); + Port* q = _session->engine().get_port_by_name (*j); - /* we don't know the state of connections between two non-Ardour ports */ if (!p && !q) { - return PortMatrixNode::UNKNOWN; + /* two non-Ardour ports; things are slightly more involved */ + /* XXX: is this the easiest way to do this? */ + /* XXX: isn't this very inefficient? */ + + jack_client_t* jack = _session->engine().jack (); + jack_port_t* jp = jack_port_by_name (jack, i->c_str()); + if (jp == 0) { + return PortMatrixNode::NOT_ASSOCIATED; + } + + char const ** c = jack_port_get_all_connections (jack, jp); + + char const ** p = c; + + while (p && *p != 0) { + if (strcmp (*p, j->c_str()) == 0) { + free (c); + return PortMatrixNode::ASSOCIATED; + } + ++p; + } + + free (c); + return PortMatrixNode::NOT_ASSOCIATED; } if (p && p->connected_to (*j) == false) { @@ -110,20 +143,21 @@ GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const return PortMatrixNode::ASSOCIATED; } -GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session& s, ARDOUR::DataType t) - : _port_matrix (this, s, t) +GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t) + : ArdourDialog (X_("reset me soon")) + , _port_matrix (this, s, t) { switch (t) { - case ARDOUR::DataType::AUDIO: - set_title (_("Audio Connections Manager")); + case DataType::AUDIO: + set_title (_("Audio Connection Manager")); break; - case ARDOUR::DataType::MIDI: - set_title (_("MIDI Connections Manager")); + case DataType::MIDI: + set_title (_("MIDI Connection Manager")); break; } - add (_port_matrix); - show_all (); + get_vbox()->pack_start (_port_matrix, true, true); + _port_matrix.show (); } void @@ -133,3 +167,22 @@ GlobalPortMatrixWindow::on_show () pair const pm_max = _port_matrix.max_size (); resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second); } + +void +GlobalPortMatrixWindow::set_session (Session* s) +{ + _port_matrix.set_session (s); +} + +string +GlobalPortMatrix::disassociation_verb () const +{ + return _("Disconnect"); +} + +string +GlobalPortMatrix::channel_noun () const +{ + return _("port"); +} +