ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove "rename_playlist" argument from Route::set_name_in_state().

Browse Source 
We no longer find playlists by name when constructing tracks, so
the name of the playlist is not relevant
This commit is contained in:
Paul Davis 2019-03-20 20:02:07 -07:00
parent acbd12c885
commit 851388e0b4
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/route.h
View File

@ -129,7 +129,7 @@ public:
void set_comment (std::string str, void *src);
bool set_name (const std::string& str);
static void set_name_in_state (XMLNode &, const std::string &, bool rename_playlist = true);
static void set_name_in_state (XMLNode &, const std::string &);
boost::shared_ptr<MonitorControl> monitoring_control() const { return _monitoring_control; }

10
libs/ardour/route.cc
View File

@ -4328,7 +4328,7 @@ Route::set_name (const string& str)
* @param name New name.
*/
void
Route::set_name_in_state (XMLNode& node, string const & name, bool rename_playlist)
Route::set_name_in_state (XMLNode& node, string const & name)
{
node.set_property (X_("name"), name);
@ -4345,14 +4345,6 @@ Route::set_name_in_state (XMLNode& node, string const & name, bool rename_playli
if ((*i)->get_property (X_("role"), str) && str == X_("Main")) {
(*i)->set_property (X_("name"), name);
}
} else if ((*i)->name() == X_("Diskstream")) {
if (rename_playlist) {
(*i)->set_property (X_("playlist"), name + ".1");
}
(*i)->set_property (X_("name"), name);
}
}
}