X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fglobal_port_matrix.cc;h=fcd9960e43fe75010db5a1d582c5d41653e52f12;hb=13f51112c965677a4925bf03e8cc3413e10a572b;hp=8f6e923bd4701423aab32c776857ad22a7f2fbd0;hpb=73a0cd56f8bab790e0bbcf09b4f51e20175f4dc8;p=ardour.git diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc index 8f6e923bd4..fcd9960e43 100644 --- a/gtk2_ardour/global_port_matrix.cc +++ b/gtk2_ardour/global_port_matrix.cc @@ -30,8 +30,9 @@ #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 (); @@ -41,22 +42,30 @@ GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, ARDOUR::Session& s, ARDOUR:: void GlobalPortMatrix::setup_ports (int dim) { + if (!_session) { + return; + } + _ports[dim].suspend_signals (); - _ports[dim].gather (_session, dim == IN, false); + _ports[dim].gather (_session, type(), dim == IN, false, show_only_bundles ()); _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); + if (!_session) { + return; + } + + 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); + boost::shared_ptr p = _session->engine().get_port_by_name (*i); + boost::shared_ptr q = _session->engine().get_port_by_name (*j); if (p) { if (s) { @@ -73,9 +82,9 @@ GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s) } else { /* two non-Ardour ports */ if (s) { - jack_connect (_session.engine().jack (), j->c_str(), i->c_str()); + jack_connect (_session->engine().jack (), j->c_str(), i->c_str()); } else { - jack_disconnect (_session.engine().jack (), j->c_str(), i->c_str()); + jack_disconnect (_session->engine().jack (), j->c_str(), i->c_str()); } } } @@ -83,37 +92,45 @@ GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s) } 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; + } + + if (c[0].bundle->nchannels() == ChanCount::ZERO || c[1].bundle->nchannels() == ChanCount::ZERO) { + 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::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); + boost::shared_ptr p = _session->engine().get_port_by_name (*i); + boost::shared_ptr q = _session->engine().get_port_by_name (*j); if (!p && !q) { /* 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_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); @@ -138,20 +155,23 @@ 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) + : ArdourWindow (X_("reset me soon")) + , _port_matrix (this, s, t) { switch (t) { - case ARDOUR::DataType::AUDIO: + case DataType::AUDIO: set_title (_("Audio Connection Manager")); break; - case ARDOUR::DataType::MIDI: + case DataType::MIDI: set_title (_("MIDI Connection Manager")); break; } + signal_key_press_event().connect (sigc::mem_fun (_port_matrix, &PortMatrix::key_press)); + add (_port_matrix); - show_all (); + _port_matrix.show (); } void @@ -161,3 +181,26 @@ 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); + + if (!s) { + hide (); + } +} + +string +GlobalPortMatrix::disassociation_verb () const +{ + return _("Disconnect"); +} + +string +GlobalPortMatrix::channel_noun () const +{ + return _("port"); +} +