X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fglobal_port_matrix.cc;h=98760c863e915881a4c51a33b3aea96c00fcd609;hb=d69e177076aa10e19992c8f6133a8928c24c81e2;hp=2b3b9c21318d36805cea4f5b03760267e1d4f4b4;hpb=7188ec39903e4cef049468c5a0583d9ec67a290d;p=ardour.git diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc index 2b3b9c2131..98760c863e 100644 --- a/gtk2_ardour/global_port_matrix.cc +++ b/gtk2_ardour/global_port_matrix.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,6 +20,7 @@ #include #include #include "global_port_matrix.h" +#include "utils.h" #include "ardour/bundle.h" #include "ardour/session.h" @@ -28,17 +29,20 @@ #include "i18n.h" -GlobalPortMatrix::GlobalPortMatrix (ARDOUR::Session& s, ARDOUR::DataType t) - : PortMatrix (s, t) +using namespace std; + +GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, ARDOUR::Session* s, ARDOUR::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 (); } @@ -51,8 +55,8 @@ GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s) 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) { - ARDOUR::Port* p = _session.engine().get_port_by_name (*i); - ARDOUR::Port* q = _session.engine().get_port_by_name (*j); + ARDOUR::Port* p = _session->engine().get_port_by_name (*i); + ARDOUR::Port* q = _session->engine().get_port_by_name (*j); if (p) { if (s) { @@ -66,9 +70,14 @@ 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 */ } } } @@ -76,23 +85,49 @@ GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s) PortMatrixNode::State GlobalPortMatrix::get_state (ARDOUR::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 (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) { - ARDOUR::Port* p = _session.engine().get_port_by_name (*i); - ARDOUR::Port* q = _session.engine().get_port_by_name (*j); + ARDOUR::Port* p = _session->engine().get_port_by_name (*i); + ARDOUR::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) { @@ -107,39 +142,45 @@ GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const return PortMatrixNode::ASSOCIATED; } -GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session& s, ARDOUR::DataType t) - : _port_matrix (s, t) +GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session* s, ARDOUR::DataType t) + : _port_matrix (this, s, t) { switch (t) { case ARDOUR::DataType::AUDIO: - set_title (_("Audio Connections Manager")); + set_title (_("Audio Connection Manager")); break; case ARDOUR::DataType::MIDI: - set_title (_("MIDI Connections Manager")); + set_title (_("MIDI Connection Manager")); break; } - Gtk::HBox* buttons_hbox = Gtk::manage (new Gtk::HBox); - - _rescan_button.set_label (_("Rescan")); - _rescan_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::REFRESH, Gtk::ICON_SIZE_BUTTON))); - _rescan_button.signal_clicked().connect (sigc::mem_fun (_port_matrix, &GlobalPortMatrix::setup_all_ports)); - buttons_hbox->pack_start (_rescan_button, Gtk::PACK_SHRINK); + add (_port_matrix); + _port_matrix.show (); +} - _show_ports_button.set_label (_("Show individual ports")); - _show_ports_button.set_active (true); - _show_ports_button.signal_toggled().connect (sigc::mem_fun (*this, &GlobalPortMatrixWindow::show_ports_toggled)); - buttons_hbox->pack_start (_show_ports_button, Gtk::PACK_SHRINK); - - Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox); - vbox->pack_start (_port_matrix); - vbox->pack_start (*buttons_hbox, Gtk::PACK_SHRINK); - add (*vbox); - show_all (); +void +GlobalPortMatrixWindow::on_show () +{ + Gtk::Window::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::show_ports_toggled () +GlobalPortMatrixWindow::set_session (ARDOUR::Session* s) +{ + _port_matrix.set_session (s); +} + +string +GlobalPortMatrix::disassociation_verb () const +{ + return _("Disconnect"); +} + +string +GlobalPortMatrix::channel_noun () const { - _port_matrix.set_show_only_bundles (!_show_ports_button.get_active()); + return _("port"); } +