Various playlist editor developments and fixes.

1 files changed, 2 insertions, 18 deletions

diff --git a/src/lib/spl_entry.cc b/src/lib/spl_entry.cc
index ed5a469ac..5b011a046 100644
--- a/src/lib/spl_entry.cc
+++ b/src/lib/spl_entry.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,7 +18,7 @@
 
 */
 
-#include "swaroop_spl_entry.h"
+#include "spl_entry.h"
 #include "dcp_content.h"
 #include "dcpomatic_assert.h"
 #include <libxml++/libxml++.h>
@@ -27,17 +27,6 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
 SPLEntry::SPLEntry (shared_ptr<Content> content)
-	: skippable (false)
-	, disable_timeline (false)
-	, stop_after_play (false)
-{
-	construct (content);
-}
-
-SPLEntry::SPLEntry (shared_ptr<Content> content, cxml::ConstNodePtr node)
-	: skippable (node->bool_child("Skippable"))
-	, disable_timeline (node->bool_child("DisableTimeline"))
-	, stop_after_play (node->bool_child("StopAfterPlay"))
 {
 	construct (content);
 }
@@ -53,11 +42,9 @@ SPLEntry::construct (shared_ptr<Content> c)
 		DCPOMATIC_ASSERT (dcp->cpl());
 		id = *dcp->cpl();
 		kind = dcp->content_kind().get_value_or(dcp::FEATURE);
-		type = DCP;
 		encrypted = dcp->encrypted ();
 	} else {
 		name = content->path(0).filename().string();
-		type = ECINEMA;
 		kind = dcp::FEATURE;
 	}
 }
@@ -66,7 +53,4 @@ void
 SPLEntry::as_xml (xmlpp::Element* e)
 {
 	e->add_child("Digest")->add_child_text(digest);
-	e->add_child("Skippable")->add_child_text(skippable ? "1" : "0");
-	e->add_child("DisableTimeline")->add_child_text(disable_timeline ? "1" : "0");
-	e->add_child("StopAfterPlay")->add_child_text(stop_after_play ? "1" : "0");
 }