enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / gtk2_ardour / global_port_matrix.cc

diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index 8c1fde30827f8294182442d956f709c09ec0a73b..9a6db259dcb44f9f4ddfdcb95630ad3d13bea143 100644 (file)
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -19,6 +19,7 @@
 
 #include <gtkmm/image.h>
 #include <gtkmm/stock.h>
+
 #include "global_port_matrix.h"
 #include "utils.h"
 
@@ -27,10 +28,11 @@
 #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, Session* s, DataType t)
        : PortMatrix (p, s, t)
@@ -47,7 +49,7 @@ GlobalPortMatrix::setup_ports (int dim)
        }
 
        _ports[dim].suspend_signals ();
-       _ports[dim].gather (_session, type(), dim == IN, false, show_only_bundles ());
+       _ports[dim].gather (_session, type(), dim == FLOW_IN, false, show_only_bundles ());
        _ports[dim].resume_signals ();
 }
 
@@ -58,8 +60,8 @@ GlobalPortMatrix::set_state (BundleChannel c[2], bool s)
                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);
+       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 (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) {
@@ -82,9 +84,9 @@ GlobalPortMatrix::set_state (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);
                                }
                        }
                }
@@ -102,8 +104,8 @@ GlobalPortMatrix::get_state (BundleChannel c[2]) const
                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);
+       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 */
@@ -113,33 +115,25 @@ GlobalPortMatrix::get_state (BundleChannel c[2]) const
        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) {
 
-                       boost::shared_ptr<Port> p = _session->engine().get_port_by_name (*i);
-                       boost::shared_ptr<Port> q = _session->engine().get_port_by_name (*j);
+                       boost::shared_ptr<Port> p = AudioEngine::instance()->get_port_by_name (*i);
+                       boost::shared_ptr<Port> 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;
+                               /* see if it is connected to the other one ... */
 
-                               while (p && *p != 0) {
-                                       if (strcmp (*p, j->c_str()) == 0) {
-                                               free (c);
-                                               return PortMatrixNode::ASSOCIATED;
-                                       }
-                                       ++p;
+                               if (AudioEngine::instance()->port_engine().connected_to (ph, *j, false)) {
+                                       return PortMatrixNode::ASSOCIATED;
                                }
 
-                               free (c);
                                return PortMatrixNode::NOT_ASSOCIATED;
                        }