X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fplaylist_source.cc;h=ed8735b86530c06b866858baa8c4ae1af179a9c6;hb=9a0b1cce075f32768197d001f269a191869cc4e6;hp=4c01831b02380012c077a8c3203c202687879d02;hpb=0938a42440cc82ce8d0cb064840c258c863714ab;p=ardour.git

diff --git a/libs/ardour/playlist_source.cc b/libs/ardour/playlist_source.cc
index 4c01831b02..ed8735b865 100644
--- a/libs/ardour/playlist_source.cc
+++ b/libs/ardour/playlist_source.cc
@@ -33,9 +33,6 @@
 #include "ardour/playlist.h"
 #include "ardour/playlist_source.h"
 #include "ardour/playlist_factory.h"
-#include "ardour/session.h"
-#include "ardour/session_playlists.h"
-#include "ardour/source_factory.h"
 
 #include "i18n.h"
 
@@ -86,7 +83,7 @@ PlaylistSource::add_state (XMLNode& node)
 	node.add_property ("offset", buf);
 	snprintf (buf, sizeof (buf), "%" PRIu64, _playlist_length);
 	node.add_property ("length", buf);
-	node.add_property ("original", _id.to_s());
+	node.add_property ("original", id().to_s());
 
 	node.add_child_nocopy (_playlist->get_state());
 }
@@ -141,11 +138,15 @@ PlaylistSource::set_state (const XMLNode& node, int /*version*/)
 
 	sscanf (prop->value().c_str(), "%" PRIu64, &_playlist_length);
 
+	/* XXX not quite sure why we set our ID back to the "original" one
+	   here. october 2011, paul
+	*/
+
 	if ((prop = node.property (X_("original"))) == 0) {
 		throw failed_constructor ();
 	}
 
-	_id = prop->value();
+	set_id (prop->value());
 
 	_level = _playlist->max_source_level () + 1;