diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 15:22:33 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 15:22:33 -0400 |
| commit | 32f4d7787e0916f6b90eeba25838e37d44706280 (patch) | |
| tree | fa37850ee4bb3ecd59bec06e1cc34ace69d070bc | |
| parent | 029c530203748b2a53706d152a33adfb38ef08d3 (diff) | |
Change/improve enum as IN and OUT are defined via windows.h
| -rw-r--r-- | gtk2_ardour/global_port_matrix.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/global_port_matrix.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc index 8c1fde3082..e1bdfb199e 100644 --- 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 d45a639093..3def23a6a3 100644 --- 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, }; }; |