Change/improve enum as IN and OUT are defined via windows.h

diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index 8c1fde30827f8294182442d956f709c09ec0a73b..e1bdfb199e8872c14a473a6b7461618d2d2817e9 100644 (file)
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -47,7 +47,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 +58,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) {
@@ -102,8 +102,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 */

diff --git a/gtk2_ardour/global_port_matrix.h b/gtk2_ardour/global_port_matrix.h
index d45a6390938c067f6d10bb10640b62da3c3b50a1..3def23a6a3d6c47c7f47d64d33931bbc015d04ea 100644 (file)
--- a/gtk2_ardour/global_port_matrix.h
+++ b/gtk2_ardour/global_port_matrix.h
@@ -46,8 +46,8 @@ public:
 private:
        /* see PortMatrix: signal flow from 0 to 1 (out to in) */
        enum {
-               OUT = 0,
-               IN = 1,
+               FLOW_OUT = 0,
+               FLOW_IN = 1,
        };
 };