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

We no longer find playlists by name when constructing tracks, so
the name of the playlist is not relevant

2 files changed, 2 insertions, 10 deletions

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 7a9786bb3a..a8278874b0 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -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; }
 
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 35d5922050..00a966aa2c 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -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);
-
 		}
 	}
 }