smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

Change get_routes to get_routelist where appropriate.

Browse source
This commit is contained in:
Len Ovens 2018-11-07 13:05:05 -08:00
parent 80fd215a5c
commit 0140b24248
7 changed files with 13 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gtk2_ardour/editor_routes.cc
View file

@ -1486,16 +1486,7 @@ EditorRoutes::initial_display ()
StripableList s; StripableList s;
RouteList r (*_session->get_routes()); _session->get_stripables (s);
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);
}
_editor->add_stripables (s); _editor->add_stripables (s);
sync_treeview_from_presentation_info (Properties::order); sync_treeview_from_presentation_info (Properties::order);

4
gtk2_ardour/export_channel_selector.cc
View file

@ -112,7 +112,7 @@ void
PortExportChannelSelector::fill_route_list () PortExportChannelSelector::fill_route_list ()
{ {
channel_view.clear_routes (); channel_view.clear_routes ();
RouteList routes = *_session->get_routes(); RouteList routes = _session->get_routelist();
/* Add master bus and then everything else */ /* Add master bus and then everything else */
@ -658,7 +658,7 @@ void
TrackExportChannelSelector::fill_list() TrackExportChannelSelector::fill_list()
{ {
track_list->clear(); track_list->clear();
RouteList routes = *_session->get_routes(); RouteList routes = _session->get_routelist();
for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) { for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) {
if (!boost::dynamic_pointer_cast<Track>(*it)) { if (!boost::dynamic_pointer_cast<Track>(*it)) {

13
gtk2_ardour/group_tabs.cc
View file

@ -564,11 +564,10 @@ GroupTabs::get_rec_enabled ()
RouteList RouteList
GroupTabs::get_soloed () GroupTabs::get_soloed ()
{ {
boost::shared_ptr<RouteList> rl = _session->get_routes (); RouteList rl = _session->get_routelist ();
RouteList soloed; 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()) { if (!(*i)->is_master() && (*i)->soloed()) {
soloed.push_back (*i); soloed.push_back (*i);
} }
@ -695,16 +694,16 @@ GroupTabs::collect (RouteGroup* g)
int const N = group_routes->size (); int const N = group_routes->size ();
RouteList::iterator i = group_routes->begin (); RouteList::iterator i = group_routes->begin ();
boost::shared_ptr<RouteList> routes = _session->get_routes (); RouteList routes = _session->get_routelist ();
routes->sort (Stripable::Sorter()); routes.sort (Stripable::Sorter());
RouteList::const_iterator j = routes->begin (); RouteList::const_iterator j = routes.begin ();
int diff = 0; int diff = 0;
int coll = -1; int coll = -1;
PresentationInfo::ChangeSuspender cs; 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(); PresentationInfo::order_t const k = (*j)->presentation_info ().order();

4
gtk2_ardour/meterbridge.cc
View file

@ -431,9 +431,7 @@ Meterbridge::set_session (Session* s)
_show_master = _session->config.get_show_master_on_meterbridge(); _show_master = _session->config.get_show_master_on_meterbridge();
_show_midi = _session->config.get_show_midi_on_meterbridge(); _show_midi = _session->config.get_show_midi_on_meterbridge();
boost::shared_ptr<RouteList> routes = _session->get_routes(); RouteList copy = _session->get_routelist ();
RouteList copy (*routes);
copy.sort (Stripable::Sorter (true)); copy.sort (Stripable::Sorter (true));
add_strips (copy); add_strips (copy);

3
gtk2_ardour/mixer_strip.cc
View file

@ -910,8 +910,7 @@ MixerStrip::output_press (GdkEventButton *ev)
} }
/* then other routes inputs */ /* then other routes inputs */
boost::shared_ptr<ARDOUR::RouteList> routes = _session->get_routes (); RouteList copy = _session->get_routelist ();
RouteList copy = *routes;
copy.sort (RouteCompareByName ()); copy.sort (RouteCompareByName ());
for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) { for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {
maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current, intended_type); maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current, intended_type);

13
gtk2_ardour/mixer_ui.cc
View file

@ -1602,18 +1602,7 @@ void
Mixer_UI::initial_track_display () Mixer_UI::initial_track_display ()
{ {
StripableList sl; StripableList sl;
_session->get_stripables (sl);
boost::shared_ptr<RouteList> 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<Stripable> (*v));
}
sl.sort (PresentationInfoMixerSorter()); sl.sort (PresentationInfoMixerSorter());

3
gtk2_ardour/plugin_pin_dialog.cc
View file

@ -1820,8 +1820,7 @@ PluginPinWidget::sc_input_press (GdkEventButton *ev, boost::weak_ptr<ARDOUR::Por
} }
#endif #endif
boost::shared_ptr<ARDOUR::RouteList> routes = _session->get_routes (); RouteList copy = _session->get_routelist ();
RouteList copy = *routes;
copy.sort (Stripable::Sorter(true)); copy.sort (Stripable::Sorter(true));
uint32_t added = 0; uint32_t added = 0;
for (ARDOUR::RouteList::const_iterator i = copy.begin (); i != copy.end (); ++i) { for (ARDOUR::RouteList::const_iterator i = copy.begin (); i != copy.end (); ++i) {