Bump libdcp for better ContentKind support, and libsub

[dcpomatic.git] / src / lib / spl_entry.h

diff --git a/src/lib/spl_entry.h b/src/lib/spl_entry.h
index d939ec66a23193d205972f5f033559ed4726ebcc..6fa3dd32cacc22887f6d71419735ee832f838c4d 100644 (file)
--- 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_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