diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-09 20:21:19 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-09 20:21:19 +0000 |
| commit | e6eb059576eefd9a26c177627ae7dd3ba2feb727 (patch) | |
| tree | 536ce6ee456f2306bb0346a51ede0a4aa64a8e63 /gtk2_ardour/session_option_editor.cc | |
| parent | 9bd274bfdee62c9cc0e5752d2a72027d2c732cd0 (diff) | |
the big Route structure refactor. !!!! THIS WILL ***NOT LOAD*** PRIOR 3.0 or 2.X SESSIONS !!!! BREAKAGE IS EXPECTED !!!! IF YOU HAVE AND NEED A WORKING 3.0 DO **NOT** UPDATE. !!!! otherwise, update and enjoy the steadily emerging joys of this major reworking of ardour internals
git-svn-id: svn://localhost/ardour2/branches/3.0@5137 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/session_option_editor.cc')
| -rw-r--r-- | gtk2_ardour/session_option_editor.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc index 76c8a85b88..09138f428e 100644 --- a/gtk2_ardour/session_option_editor.cc +++ b/gtk2_ardour/session_option_editor.cc @@ -25,12 +25,12 @@ public: void setup_ports (int dim) { - cerr << _session.the_auditioner()->outputs().num_ports() << "\n"; + cerr << _session.the_auditioner()->output()->n_ports() << "\n"; if (dim == OURS) { _port_group->clear (); - _port_group->add_bundle (_session.click_io()->bundle_for_outputs()); - _port_group->add_bundle (_session.the_auditioner()->bundle_for_outputs()); + _port_group->add_bundle (_session.click_io()->bundle()); + _port_group->add_bundle (_session.the_auditioner()->output()->bundle()); } else { _ports[OTHER].gather (_session, true); } @@ -41,7 +41,7 @@ public: Bundle::PortList const & our_ports = c[OURS].bundle->channel_ports (c[OURS].channel); Bundle::PortList const & other_ports = c[OTHER].bundle->channel_ports (c[OTHER].channel); - if (c[OURS].bundle == _session.click_io()->bundle_for_outputs()) { + if (c[OURS].bundle == _session.click_io()->bundle()) { for (ARDOUR::Bundle::PortList::const_iterator i = our_ports.begin(); i != our_ports.end(); ++i) { for (ARDOUR::Bundle::PortList::const_iterator j = other_ports.begin(); j != other_ports.end(); ++j) { @@ -50,9 +50,9 @@ public: assert (f); if (s) { - _session.click_io()->connect_output (f, *j, 0); + _session.click_io()->connect (f, *j, 0); } else { - _session.click_io()->disconnect_output (f, *j, 0); + _session.click_io()->disconnect (f, *j, 0); } } } @@ -64,7 +64,7 @@ public: Bundle::PortList const & our_ports = c[OURS].bundle->channel_ports (c[OURS].channel); Bundle::PortList const & other_ports = c[OTHER].bundle->channel_ports (c[OTHER].channel); - if (c[OURS].bundle == _session.click_io()->bundle_for_outputs()) { + if (c[OURS].bundle == _session.click_io()->bundle()) { for (ARDOUR::Bundle::PortList::const_iterator i = our_ports.begin(); i != our_ports.end(); ++i) { for (ARDOUR::Bundle::PortList::const_iterator j = other_ports.begin(); j != other_ports.end(); ++j) { |