X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fglobal_port_matrix.cc;h=9a6db259dcb44f9f4ddfdcb95630ad3d13bea143;hb=ae3c50c495ffadbc62103cc1d3a61af2b48f423e;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..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,35 +28,46 @@ #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 (); + init (); } void GlobalPortMatrix::setup_ports (int dim) { + if (!_session) { + return; + } + _ports[dim].suspend_signals (); - _ports[dim].gather (_session, dim == IN); + _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) { @@ -69,33 +81,60 @@ GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s) } else { q->disconnect (*i); } + } else { + /* two non-Ardour ports */ + if (s) { + AudioEngine::instance()->connect (*j, *i); + } else { + AudioEngine::instance()->disconnect (*j, *i); + } } - - /* 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; + } + + 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::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); + boost::shared_ptr p = AudioEngine::instance()->get_port_by_name (*i); + boost::shared_ptr q = AudioEngine::instance()->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 */ + + /* 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; + } + + /* see if it is connected to the other one ... */ + + if (AudioEngine::instance()->port_engine().connected_to (ph, *j, false)) { + return PortMatrixNode::ASSOCIATED; + } + + return PortMatrixNode::NOT_ASSOCIATED; } if (p && p->connected_to (*j) == false) { @@ -110,20 +149,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: - 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; } + signal_key_press_event().connect (sigc::mem_fun (_port_matrix, &PortMatrix::key_press)); + add (_port_matrix); - show_all (); + _port_matrix.show (); } void @@ -133,3 +175,35 @@ 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 (); + } +} + +void +GlobalPortMatrix::set_session (Session *s) +{ + SessionHandlePtr::set_session (s); + if (!s) return; + setup_all_ports (); + init(); +} + +string +GlobalPortMatrix::disassociation_verb () const +{ + return _("Disconnect"); +} + +string +GlobalPortMatrix::channel_noun () const +{ + return _("port"); +} +