C++11 tidying.

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

diff --git a/src/lib/spl_entry.cc b/src/lib/spl_entry.cc
index a2f36317e11146064f3fd5234aa518484b669861..878bd610f287faa16440b02906a3f641e3e751e2 100644 (file)
--- 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-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,55 +18,40 @@
 
 */
 
-#include "spl_entry.h"
+
 #include "dcp_content.h"
 #include "dcpomatic_assert.h"
+#include "spl_entry.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 
-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);
-}
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
-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);
-}
 
-void
-SPLEntry::construct (shared_ptr<Content> c)
+SPLEntry::SPLEntry (shared_ptr<Content> c)
+       : content (c)
+       , digest (content->digest())
 {
-       content = c;
-       shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (content);
-       digest = content->digest ();
+       auto dcp = dynamic_pointer_cast<DCPContent> (content);
        if (dcp) {
                name = dcp->name ();
                DCPOMATIC_ASSERT (dcp->cpl());
                id = *dcp->cpl();
-               kind = dcp->content_kind().get_value_or(dcp::FEATURE);
-               type = DCP;
+               kind = dcp->content_kind().get_value_or(dcp::ContentKind::FEATURE);
                encrypted = dcp->encrypted ();
        } else {
                name = content->path(0).filename().string();
-               type = ECINEMA;
-               kind = dcp::FEATURE;
+               kind = dcp::ContentKind::FEATURE;
        }
 }
 
+
 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");
 }