diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-05-03 14:31:42 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-05-03 14:31:42 +0000 |
| commit | 1ae39840b3e7b1740b44e5889983e93d837f8e90 (patch) | |
| tree | 3d0e33c90ae040fff6f4b30250d0a22d0ce2c0c8 /gtk2_ardour/io_selector.cc | |
| parent | 7e48118bf16702dc174875510b935f37290d56a7 (diff) | |
Support for the port matrix working at the bundle level and hiding details of ports.
git-svn-id: svn://localhost/ardour2/branches/3.0@5029 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/io_selector.cc')
| -rw-r--r-- | gtk2_ardour/io_selector.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index fb2c66a4be..93ade90dca 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -112,7 +112,7 @@ IOSelector::set_state (ARDOUR::BundleChannel c[2], bool s) } } -PortMatrix::State +PortMatrixNode::State IOSelector::get_state (ARDOUR::BundleChannel c[2]) const { ARDOUR::Bundle::PortList const & our_ports = c[_ours].bundle->channel_ports (c[_ours].channel); @@ -121,7 +121,7 @@ IOSelector::get_state (ARDOUR::BundleChannel c[2]) const if (our_ports.empty() || other_ports.empty()) { /* we're looking at a bundle with no parts associated with this channel, so nothing to connect */ - return UNKNOWN; + return PortMatrixNode::UNKNOWN; } for (ARDOUR::Bundle::PortList::const_iterator i = our_ports.begin(); i != our_ports.end(); ++i) { @@ -135,12 +135,12 @@ IOSelector::get_state (ARDOUR::BundleChannel c[2]) const if (!f->connected_to (*j)) { /* if any one thing is not connected, all bets are off */ - return NOT_ASSOCIATED; + return PortMatrixNode::NOT_ASSOCIATED; } } } - return ASSOCIATED; + return PortMatrixNode::ASSOCIATED; } uint32_t |