From d1c2098c112c65d9fcb11805e53df53134ae88b5 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 8 Jan 2020 19:37:55 -0700
Subject: [PATCH] fix bugs (thinkos?) that confused PlaylistSource's id() with
 its original()

---
 libs/ardour/playlist_source.cc | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/libs/ardour/playlist_source.cc b/libs/ardour/playlist_source.cc
index 5b22465b38..dc03bbeb2d 100644
--- a/libs/ardour/playlist_source.cc
+++ b/libs/ardour/playlist_source.cc
@@ -82,7 +82,7 @@ PlaylistSource::add_state (XMLNode& node)
 	node.set_property ("playlist", _playlist->id ());
 	node.set_property ("offset", _playlist_offset);
 	node.set_property ("length", _playlist_length);
-	node.set_property ("original", id());
+	node.set_property ("original", _original);
 
 	node.add_child_nocopy (_playlist->get_state());
 }
@@ -135,17 +135,10 @@ PlaylistSource::set_state (const XMLNode& node, int /*version*/)
 		throw failed_constructor ();
 	}
 
-	/* XXX not quite sure why we set our ID back to the "original" one
-	   here. october 2011, paul
-	*/
-
-	std::string str;
-	if (!node.get_property (X_("original"), str)) {
+	if (!node.get_property (X_("original"), _original)) {
 		throw failed_constructor ();
 	}
 
-	set_id (str);
-
 	_level = _playlist->max_source_level () + 1;
 
 	return 0;