X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fspl_entry.h;h=740082eaf0f9a3d6e0d56bcc222024fe1ec6b8d1;hp=75e0b5223c8e0ef012dd8d3389a3bd4b61bb94d7;hb=54af50c3b8e9082f9751e809d63540c51197a4a1;hpb=d3f97ca7ca2877689f4ed59482e935431d43f027 diff --git a/src/lib/spl_entry.h b/src/lib/spl_entry.h index 75e0b5223..740082eaf 100644 --- a/src/lib/spl_entry.h +++ b/src/lib/spl_entry.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 Carl Hetherington + Copyright (C) 2018-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -18,8 +18,8 @@ */ -#ifndef DCPOMATIC_SWAROOP_SPL_ENTRY_H -#define DCPOMATIC_SWAROOP_SPL_ENTRY_H +#ifndef DCPOMATIC_SPL_ENTRY_H +#define DCPOMATIC_SPL_ENTRY_H #include #include @@ -35,7 +35,6 @@ class SPLEntry { public: SPLEntry (boost::shared_ptr content); - SPLEntry (boost::shared_ptr content, cxml::ConstNodePtr node); void as_xml (xmlpp::Element* e); @@ -43,18 +42,10 @@ public: 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; bool encrypted; - bool skippable; - bool disable_timeline; - bool stop_after_play; private: void construct (boost::shared_ptr content);