X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fglobal_port_matrix.cc;h=9a6db259dcb44f9f4ddfdcb95630ad3d13bea143;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=98760c863e915881a4c51a33b3aea96c00fcd609;hpb=12e3fb454145be52ddc82871bedf19b5c32d1c39;p=ardour.git diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc index 98760c863e..9a6db259dc 100644 --- a/gtk2_ardour/global_port_matrix.cc +++ b/gtk2_ardour/global_port_matrix.cc @@ -19,6 +19,7 @@ #include #include + #include "global_port_matrix.h" #include "utils.h" @@ -27,11 +28,13 @@ #include "ardour/audioengine.h" #include "ardour/port.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; +using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; -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 +44,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, type(), dim == IN, false); + _ports[dim].gather (_session, type(), dim == FLOW_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[FLOW_IN].bundle->channel_ports (c[FLOW_IN].channel); + Bundle::PortList const & out_ports = c[FLOW_OUT].bundle->channel_ports (c[FLOW_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 +84,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()); + AudioEngine::instance()->connect (*j, *i); } else { - jack_disconnect (_session->engine().jack (), j->c_str(), i->c_str()); + AudioEngine::instance()->disconnect (*j, *i); } } } @@ -83,50 +94,46 @@ 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 { if (_session == 0) { return PortMatrixNode::NOT_ASSOCIATED; } - - 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 (c[0].bundle->nchannels() == ChanCount::ZERO || c[1].bundle->nchannels() == ChanCount::ZERO) { + return PortMatrixNode::NOT_ASSOCIATED; + } + + Bundle::PortList const & in_ports = c[FLOW_IN].bundle->channel_ports (c[FLOW_IN].channel); + Bundle::PortList const & out_ports = c[FLOW_OUT].bundle->channel_ports (c[FLOW_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 = AudioEngine::instance()->get_port_by_name (*i); + boost::shared_ptr q = AudioEngine::instance()->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_port_t* jp = jack_port_by_name (jack, i->c_str()); - if (jp == 0) { + /* get a port handle for one of them .. */ + + PortEngine::PortHandle ph = AudioEngine::instance()->port_engine().get_port_by_name (*i); + if (!ph) { 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; + + /* see if it is connected to the other one ... */ + + if (AudioEngine::instance()->port_engine().connected_to (ph, *j, false)) { + return PortMatrixNode::ASSOCIATED; } - free (c); return PortMatrixNode::NOT_ASSOCIATED; } @@ -142,18 +149,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) + : 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); _port_matrix.show (); } @@ -167,9 +177,22 @@ GlobalPortMatrixWindow::on_show () } void -GlobalPortMatrixWindow::set_session (ARDOUR::Session* s) +GlobalPortMatrixWindow::set_session (Session* s) { _port_matrix.set_session (s); + + if (!s) { + hide (); + } +} + +void +GlobalPortMatrix::set_session (Session *s) +{ + SessionHandlePtr::set_session (s); + if (!s) return; + setup_all_ports (); + init(); } string @@ -183,4 +206,4 @@ GlobalPortMatrix::channel_noun () const { return _("port"); } - +