hotfix for flying percussive hits while dragging.

[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 80e2616bd81088023092333720548767f89e5ec0..9a6db259dcb44f9f4ddfdcb95630ad3d13bea143 100644 (file)
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -28,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)
@@ -48,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 ();
 }
 
@@ -59,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) {
@@ -103,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 */