X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fspl_entry.cc;h=f0b377a56bfe5b6d0b983f22aa293a4b39702f2a;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=440f9861b882f56e5b0edeebcd6ec43aadc4361c;hpb=28111007e2e6fd62f5810be780706ae1618bd33f;p=dcpomatic.git

diff --git a/src/lib/spl_entry.cc b/src/lib/spl_entry.cc
index 440f9861b..f0b377a56 100644
--- a/src/lib/spl_entry.cc
+++ b/src/lib/spl_entry.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,28 +18,25 @@
 
 */
 
-#include "spl_entry.h"
+
 #include "dcp_content.h"
 #include "dcpomatic_assert.h"
-#include "warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include "spl_entry.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+
 
 using std::shared_ptr;
 using std::dynamic_pointer_cast;
 
-SPLEntry::SPLEntry (shared_ptr<Content> content)
-{
-	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());
@@ -52,6 +49,7 @@ SPLEntry::construct (shared_ptr<Content> c)
 	}
 }
 
+
 void
 SPLEntry::as_xml (xmlpp::Element* e)
 {