X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fspl_entry.h;h=6fa3dd32cacc22887f6d71419735ee832f838c4d;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=75e0b5223c8e0ef012dd8d3389a3bd4b61bb94d7;hpb=d3f97ca7ca2877689f4ed59482e935431d43f027;p=dcpomatic.git

diff --git a/src/lib/spl_entry.h b/src/lib/spl_entry.h
index 75e0b5223..6fa3dd32c 100644
--- a/src/lib/spl_entry.h
+++ b/src/lib/spl_entry.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,12 +18,14 @@
 
 */
 
-#ifndef DCPOMATIC_SWAROOP_SPL_ENTRY_H
-#define DCPOMATIC_SWAROOP_SPL_ENTRY_H
+
+#ifndef DCPOMATIC_SPL_ENTRY_H
+#define DCPOMATIC_SPL_ENTRY_H
+
 
 #include <libcxml/cxml.h>
-#include <dcp/types.h>
-#include <boost/shared_ptr.hpp>
+#include <dcp/content_kind.h>
+
 
 namespace xmlpp {
 	class Element;
@@ -31,33 +33,26 @@ namespace xmlpp {
 
 class Content;
 
+
 class SPLEntry
 {
 public:
-	SPLEntry (boost::shared_ptr<Content> content);
-	SPLEntry (boost::shared_ptr<Content> content, cxml::ConstNodePtr node);
+	SPLEntry (std::shared_ptr<Content> c);
 
 	void as_xml (xmlpp::Element* e);
 
-	boost::shared_ptr<Content> content;
+	std::shared_ptr<Content> content;
 	std::string name;
 	/** Digest of this content */
 	std::string digest;
-	/** CPL ID or something else for MP4 (?) */
+	/** CPL ID */
 	std::string id;
-	dcp::ContentKind kind;
-	enum Type {
-		DCP,
-		ECINEMA
-	};
-	Type type;
+	boost::optional<dcp::ContentKind> kind;
 	bool encrypted;
-	bool skippable;
-	bool disable_timeline;
-	bool stop_after_play;
 
 private:
-	void construct (boost::shared_ptr<Content> content);
+	void construct (std::shared_ptr<Content> content);
 };
 
+
 #endif