Change get_routes to get_routelist where appropriate.
This commit is contained in:
parent
80fd215a5c
commit
0140b24248
|
@ -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);
|
||||
|
|
|
@ -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<Track>(*it)) {
|
||||
|
|
|
@ -564,11 +564,10 @@ GroupTabs::get_rec_enabled ()
|
|||
RouteList
|
||||
GroupTabs::get_soloed ()
|
||||
{
|
||||
boost::shared_ptr<RouteList> 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<RouteList> 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();
|
||||
|
||||
|
|
|
@ -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<RouteList> routes = _session->get_routes();
|
||||
|
||||
RouteList copy (*routes);
|
||||
RouteList copy = _session->get_routelist ();
|
||||
copy.sort (Stripable::Sorter (true));
|
||||
add_strips (copy);
|
||||
|
||||
|
|
|
@ -910,8 +910,7 @@ MixerStrip::output_press (GdkEventButton *ev)
|
|||
}
|
||||
|
||||
/* then other routes inputs */
|
||||
boost::shared_ptr<ARDOUR::RouteList> 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);
|
||||
|
|
|
@ -1602,18 +1602,7 @@ void
|
|||
Mixer_UI::initial_track_display ()
|
||||
{
|
||||
StripableList 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));
|
||||
}
|
||||
_session->get_stripables (sl);
|
||||
|
||||
sl.sort (PresentationInfoMixerSorter());
|
||||
|
||||
|
|
|
@ -1820,8 +1820,7 @@ PluginPinWidget::sc_input_press (GdkEventButton *ev, boost::weak_ptr<ARDOUR::Por
|
|||
}
|
||||
#endif
|
||||
|
||||
boost::shared_ptr<ARDOUR::RouteList> 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) {
|
||||
|
|
Loading…
Reference in New Issue