From b6925e274f3cdec66040cbef50740be221efd0b4 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 13 Nov 2015 16:14:09 -0500 Subject: substantial part of infrastructure required for track/bus duplication This includes removing the removal of ID values in XML, and its replacement with thread-local forcing of ID resets, implemented in a previous commit --- libs/ardour/route.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libs/ardour/route.cc') diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 65f4531ac8..babec9ea74 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -4172,7 +4172,7 @@ Route::set_name (const string& str) * @param name New name. */ void -Route::set_name_in_state (XMLNode& node, string const & name) +Route::set_name_in_state (XMLNode& node, string const & name, bool rename_playlist) { node.add_property (X_("name"), name); @@ -4192,7 +4192,9 @@ Route::set_name_in_state (XMLNode& node, string const & name) } else if ((*i)->name() == X_("Diskstream")) { - (*i)->add_property (X_("playlist"), string_compose ("%1.1", name).c_str()); + if (rename_playlist) { + (*i)->add_property (X_("playlist"), string_compose ("%1.1", name).c_str()); + } (*i)->add_property (X_("name"), name); } -- cgit v1.2.3