From 0140b24248e95f1e7ddc15ce2ec9a466aebfa6a1 Mon Sep 17 00:00:00 2001 From: Len Ovens Date: Wed, 7 Nov 2018 13:05:05 -0800 Subject: Change get_routes to get_routelist where appropriate. --- gtk2_ardour/editor_routes.cc | 11 +---------- gtk2_ardour/export_channel_selector.cc | 4 ++-- gtk2_ardour/group_tabs.cc | 13 ++++++------- gtk2_ardour/meterbridge.cc | 4 +--- gtk2_ardour/mixer_strip.cc | 3 +-- gtk2_ardour/mixer_ui.cc | 13 +------------ gtk2_ardour/plugin_pin_dialog.cc | 3 +-- 7 files changed, 13 insertions(+), 38 deletions(-) diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index c57aef53ed..f6a5cffb0b 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -1486,16 +1486,7 @@ EditorRoutes::initial_display () StripableList s; - RouteList r (*_session->get_routes()); - for (RouteList::iterator ri = r.begin(); ri != r.end(); ++ri) { - s.push_back (*ri); - } - - VCAList v (_session->vca_manager().vcas()); - for (VCAList::iterator vi = v.begin(); vi != v.end(); ++vi) { - s.push_back (*vi); - } - + _session->get_stripables (s); _editor->add_stripables (s); sync_treeview_from_presentation_info (Properties::order); diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc index c3cf20d41b..09dab03040 100644 --- a/gtk2_ardour/export_channel_selector.cc +++ b/gtk2_ardour/export_channel_selector.cc @@ -112,7 +112,7 @@ void PortExportChannelSelector::fill_route_list () { channel_view.clear_routes (); - RouteList routes = *_session->get_routes(); + RouteList routes = _session->get_routelist(); /* Add master bus and then everything else */ @@ -658,7 +658,7 @@ void TrackExportChannelSelector::fill_list() { track_list->clear(); - RouteList routes = *_session->get_routes(); + RouteList routes = _session->get_routelist(); for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) { if (!boost::dynamic_pointer_cast(*it)) { diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index 4c17064e76..f1f8c317fd 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -564,11 +564,10 @@ GroupTabs::get_rec_enabled () RouteList GroupTabs::get_soloed () { - boost::shared_ptr rl = _session->get_routes (); - + RouteList rl = _session->get_routelist (); RouteList soloed; - for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { + for (RouteList::iterator i = rl.begin(); i != rl.end(); ++i) { if (!(*i)->is_master() && (*i)->soloed()) { soloed.push_back (*i); } @@ -695,16 +694,16 @@ GroupTabs::collect (RouteGroup* g) int const N = group_routes->size (); RouteList::iterator i = group_routes->begin (); - boost::shared_ptr routes = _session->get_routes (); - routes->sort (Stripable::Sorter()); - RouteList::const_iterator j = routes->begin (); + RouteList routes = _session->get_routelist (); + routes.sort (Stripable::Sorter()); + RouteList::const_iterator j = routes.begin (); int diff = 0; int coll = -1; PresentationInfo::ChangeSuspender cs; - while (i != group_routes->end() && j != routes->end()) { + while (i != group_routes->end() && j != routes.end()) { PresentationInfo::order_t const k = (*j)->presentation_info ().order(); diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc index 9f2ae3674e..d46a407651 100644 --- a/gtk2_ardour/meterbridge.cc +++ b/gtk2_ardour/meterbridge.cc @@ -431,9 +431,7 @@ Meterbridge::set_session (Session* s) _show_master = _session->config.get_show_master_on_meterbridge(); _show_midi = _session->config.get_show_midi_on_meterbridge(); - boost::shared_ptr routes = _session->get_routes(); - - RouteList copy (*routes); + RouteList copy = _session->get_routelist (); copy.sort (Stripable::Sorter (true)); add_strips (copy); diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 3868dd6bd0..7b94385970 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -910,8 +910,7 @@ MixerStrip::output_press (GdkEventButton *ev) } /* then other routes inputs */ - boost::shared_ptr routes = _session->get_routes (); - RouteList copy = *routes; + RouteList copy = _session->get_routelist (); copy.sort (RouteCompareByName ()); for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) { maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current, intended_type); diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 69742737bb..c916316533 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -1602,18 +1602,7 @@ void Mixer_UI::initial_track_display () { StripableList sl; - - boost::shared_ptr routes = _session->get_routes(); - - for (RouteList::iterator r = routes->begin(); r != routes->end(); ++r) { - sl.push_back (*r); - } - - VCAList vcas = _session->vca_manager().vcas(); - - for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) { - sl.push_back (boost::dynamic_pointer_cast (*v)); - } + _session->get_stripables (sl); sl.sort (PresentationInfoMixerSorter()); diff --git a/gtk2_ardour/plugin_pin_dialog.cc b/gtk2_ardour/plugin_pin_dialog.cc index 3ac10432de..0a9ad9e628 100644 --- a/gtk2_ardour/plugin_pin_dialog.cc +++ b/gtk2_ardour/plugin_pin_dialog.cc @@ -1820,8 +1820,7 @@ PluginPinWidget::sc_input_press (GdkEventButton *ev, boost::weak_ptr routes = _session->get_routes (); - RouteList copy = *routes; + RouteList copy = _session->get_routelist (); copy.sort (Stripable::Sorter(true)); uint32_t added = 0; for (ARDOUR::RouteList::const_iterator i = copy.begin (); i != copy.end (); ++i) { -- cgit v1.2.3