diff options
| -rw-r--r-- | gtk2_ardour/editor_routes.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/group_tabs.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/stripable.h | 1 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/stripable.cc | 6 |
6 files changed, 5 insertions, 12 deletions
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index e46fcfee5a..d2514c9bb4 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -1030,7 +1030,7 @@ EditorRoutes::sync_presentation_info_from_treeview () stripable->presentation_info().set_hidden (!visible); if (order != stripable->presentation_info().order()) { - stripable->set_presentation_order_explicit (order); + stripable->set_presentation_order (order, false); change = true; } diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index cf2a605089..6f57f3c525 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -682,14 +682,14 @@ GroupTabs::collect (RouteGroup* g) --diff; } - (*j)->set_presentation_order_explicit (coll); + (*j)->set_presentation_order (coll, false); ++coll; ++i; } else { - (*j)->set_presentation_order_explicit (k + diff); + (*j)->set_presentation_order (k + diff, false); } diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index b2302a5626..cd2304e7f7 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -737,7 +737,7 @@ Mixer_UI::sync_presentation_info_from_treeview () stripable->presentation_info().set_hidden (!visible); if (order != stripable->presentation_info().order()) { - stripable->set_presentation_order_explicit (order); + stripable->set_presentation_order (order, false); change = true; } diff --git a/libs/ardour/ardour/stripable.h b/libs/ardour/ardour/stripable.h index 8ad02c98b3..7cf3da1f9a 100644 --- a/libs/ardour/ardour/stripable.h +++ b/libs/ardour/ardour/stripable.h @@ -77,7 +77,6 @@ class LIBARDOUR_API Stripable : public SessionObject { /* set just the order */ void set_presentation_order (PresentationInfo::order_t, bool notify_class_listeners = true); - void set_presentation_order_explicit (PresentationInfo::order_t); struct PresentationOrderSorter { bool operator() (boost::shared_ptr<Stripable> a, boost::shared_ptr<Stripable> b) { diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index fb73ecbd36..043d72d128 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -3453,7 +3453,7 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool if (order == PresentationInfo::max_order) { /* just add to the end */ - r->set_presentation_order_explicit (n_routes + added); + r->set_presentation_order (n_routes + added, false); DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("group order not set, set to NR %1 + %2 = %3\n", n_routes, added, n_routes + added)); } else { r->set_presentation_order (order + added); diff --git a/libs/ardour/stripable.cc b/libs/ardour/stripable.cc index 2a86ef2529..744c103e48 100644 --- a/libs/ardour/stripable.cc +++ b/libs/ardour/stripable.cc @@ -48,12 +48,6 @@ Stripable::set_presentation_order (PresentationInfo::order_t order, bool notify_ } } -void -Stripable::set_presentation_order_explicit (PresentationInfo::order_t order) -{ - _presentation_info.set_order (order); -} - int Stripable::set_state (XMLNode const& node, int version) { |