Fix stripable order for new strips & master-order

5 files changed, 38 insertions, 20 deletions

diff --git a/libs/ardour/ardour/presentation_info.h b/libs/ardour/ardour/presentation_info.h
index c508f8401a..0bcfff9210 100644
--- a/libs/ardour/ardour/presentation_info.h
+++ b/libs/ardour/ardour/presentation_info.h
@@ -154,7 +154,7 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
 	int selection_cnt() const { return _selection_cnt; }
 
 	bool hidden() const { return _flags & Hidden; }
-	bool special() const { return _flags & (MasterOut|MonitorOut|Auditioner); }
+	bool special(bool with_master = true) const { return _flags & ((with_master ? MasterOut : 0)|MonitorOut|Auditioner); }
 
 	bool flag_match (Flag f) const {
 		/* no flags, match all */
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 303c0bc457..dcc9e92e9e 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -304,6 +304,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
 	boost::shared_ptr<RouteList> get_routes_with_internal_returns() const;
 	boost::shared_ptr<RouteList> get_routes_with_regions_at (framepos_t const) const;
 
+	uint32_t nstripables (bool with_auditioner_and_monitor = false) const;
 	uint32_t nroutes() const { return routes.reader()->size(); }
 	uint32_t ntracks () const;
 	uint32_t nbusses () const;
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index ae1aff5498..1e1289e8e6 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -3064,6 +3064,8 @@ Session::ensure_stripable_sort_order ()
 void
 Session::ensure_route_presentation_info_gap (PresentationInfo::order_t first_new_order, uint32_t how_many)
 {
+	DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("ensure order gap starting at %1 for %2\n", first_new_order, how_many));
+
 	if (first_new_order == PresentationInfo::max_order) {
 		/* adding at end, no worries */
 		return;
@@ -3078,7 +3080,11 @@ Session::ensure_route_presentation_info_gap (PresentationInfo::order_t first_new
 	for (StripableList::iterator si = sl.begin(); si != sl.end(); ++si) {
 		boost::shared_ptr<Stripable> s (*si);
 
-		if (s->is_monitor() || s->is_auditioner()) {
+		if (s->presentation_info().special (false)) {
+			continue;
+		}
+
+		if (!s->presentation_info().order_set()) {
 			continue;
 		}
 
@@ -3521,8 +3527,8 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool
 	{
 		RCUWriter<RouteList> writer (routes);
 		boost::shared_ptr<RouteList> r = writer.get_copy ();
-		r->insert (r->end(), new_routes.begin(), new_routes.end());
 		n_routes = r->size();
+		r->insert (r->end(), new_routes.begin(), new_routes.end());
 
 		/* if there is no control out and we're not in the middle of loading,
 		 * resort the graph here. if there is a control out, we will resort
@@ -3545,11 +3551,9 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool
 		--n_routes;
 	}
 
-	DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("ensure order gap starting at %1 for %2\n", order, new_routes.size()));
-	ensure_route_presentation_info_gap (order, new_routes.size());
-
 	{
 		PresentationInfo::ChangeSuspender cs;
+		ensure_route_presentation_info_gap (order, new_routes.size());
 
 		for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x, ++added) {
 
@@ -3586,25 +3590,13 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool
 				}
 			}
 
-			if (!r->presentation_info().special()) {
+			if (!r->presentation_info().special (false)) {
 
 				DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("checking PI state for %1\n", r->name()));
 
 				/* presentation info order may already have been set from XML */
 
 				if (!r->presentation_info().order_set()) {
-					/* this is only useful for headless sessions,
-					 * Editor::add_routes() and Mixer_UI::add_routes() will
-					 * override it following the RouteAdded signal.
-					 *
-					 * Also routes should be sorted before VCAs (like the GUI does).
-					 * Session::ensure_route_presentation_info_gap() does not special case VCAs either.
-					 *
-					 * ... but not to worry, the GUI's
-					 * gtk2_ardour/route_sorter.h and various ::sync_presentation_info_from_treeview()
-					 * handle this :)
-					 */
-
 					if (order == PresentationInfo::max_order) {
 						/* just add to the end */
 						r->set_presentation_order (n_routes + added);
@@ -3638,6 +3630,7 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool
 
 			ARDOUR::GUIIdle ();
 		}
+		ensure_stripable_sort_order ();
 	}
 
 	if (_monitor_out && IO::connecting_legal) {
@@ -6370,6 +6363,27 @@ Session::nbusses () const
 	return n;
 }
 
+uint32_t
+Session::nstripables (bool with_auditioner_and_monitor) const
+{
+	uint32_t rv = routes.reader()->size ();
+	rv += _vca_manager->vcas ().size ();
+
+	if (with_auditioner_and_monitor) {
+		return rv;
+	}
+
+	if (auditioner) {
+		assert (rv > 0);
+		--rv;
+	}
+	if (_monitor_out) {
+		assert (rv > 0);
+		--rv;
+	}
+	return rv;
+}
+
 void
 Session::add_automation_list(AutomationList *al)
 {
diff --git a/libs/ardour/stripable.cc b/libs/ardour/stripable.cc
index c4f128b4e8..721d92789f 100644
--- a/libs/ardour/stripable.cc
+++ b/libs/ardour/stripable.cc
@@ -102,7 +102,7 @@ Stripable::set_state (XMLNode const& node, int version)
 
 		}
 
-		if (!_presentation_info.special()) {
+		if (!_presentation_info.special(false)) {
 			if ((prop = node.property (X_("order-key"))) != 0) {
 				_presentation_info.set_order (atol (prop->value()));
 			}
diff --git a/libs/ardour/vca_manager.cc b/libs/ardour/vca_manager.cc
index ddc50f69ff..32ff461f1f 100644
--- a/libs/ardour/vca_manager.cc
+++ b/libs/ardour/vca_manager.cc
@@ -69,6 +69,8 @@ VCAManager::create_vca (uint32_t howmany, std::string const & name_template)
 {
 	VCAList vcal;
 
+	uint32_t n_stripables = _session.nstripables ();
+
 	{
 		Mutex::Lock lm (lock);
 
@@ -86,6 +88,7 @@ VCAManager::create_vca (uint32_t howmany, std::string const & name_template)
 			BOOST_MARK_VCA (vca);
 
 			vca->init ();
+			vca->set_presentation_order (n + n_stripables);
 
 			_vcas.push_back (vca);
 			vcal.push_back (vca);