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/export_channel_selector.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/export_channel_selector.cc')
-rw-r--r-- | gtk2_ardour/export_channel_selector.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc index 2f66e58fe5..7b665a6087 100644 --- a/gtk2_ardour/export_channel_selector.cc +++ b/gtk2_ardour/export_channel_selector.cc @@ -112,14 +112,14 @@ PortExportChannelSelector::fill_route_list () /* Add master bus and then everything else */ - ARDOUR::IO * master = session->master_out().get(); + ARDOUR::IO* master = session->master_out()->output().get(); channel_view.add_route (master); for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) { - if (it->get() == master) { + if ((*it)->output().get() == master) { continue; } - channel_view.add_route (it->get()); + channel_view.add_route ((*it)->output().get()); } update_channel_count (); @@ -261,27 +261,27 @@ PortExportChannelSelector::ChannelTreeView::set_config (ChannelConfigPtr c) } void -PortExportChannelSelector::ChannelTreeView::add_route (ARDOUR::IO * route) +PortExportChannelSelector::ChannelTreeView::add_route (ARDOUR::IO * io) { Gtk::TreeModel::iterator iter = route_list->append(); Gtk::TreeModel::Row row = *iter; row[route_cols.selected] = false; - row[route_cols.name] = route->name(); - row[route_cols.io] = route; + row[route_cols.name] = io->name(); + row[route_cols.io] = io; /* Initialize port list */ Glib::RefPtr<Gtk::ListStore> port_list = Gtk::ListStore::create (route_cols.port_cols); row[route_cols.port_list_col] = port_list; - uint32_t outs = route->n_outputs().n_audio(); + uint32_t outs = io->n_ports().n_audio(); for (uint32_t i = 0; i < outs; ++i) { iter = port_list->append(); row = *iter; row[route_cols.port_cols.selected] = false; - row[route_cols.port_cols.port] = route->audio_output (i); + row[route_cols.port_cols.port] = io->audio (i); std::ostringstream oss; oss << "Out-" << (i + 1); |