projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font_id_map errors when importing DCP subtitles that have no
[dcpomatic.git]
/
src
/
lib
/
spl_entry.cc
diff --git
a/src/lib/spl_entry.cc
b/src/lib/spl_entry.cc
index 3cb1a9a363b5adecd833bce9d7aca8d84ddefc8a..f0b377a56bfe5b6d0b983f22aa293a4b39702f2a 100644
(file)
--- a/
src/lib/spl_entry.cc
+++ b/
src/lib/spl_entry.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2018-202
0
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018-202
1
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,40
+18,38
@@
*/
*/
-#include "spl_entry.h"
+
#include "dcp_content.h"
#include "dcpomatic_assert.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>
#include <libxml++/libxml++.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
-SPLEntry::SPLEntry (shared_ptr<Content> content)
-{
- construct (content);
-}
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
-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();
if (dcp) {
name = dcp->name ();
DCPOMATIC_ASSERT (dcp->cpl());
id = *dcp->cpl();
- kind = dcp->content_kind().get_value_or(dcp::FEATURE);
+ kind = dcp->content_kind().get_value_or(dcp::
ContentKind::
FEATURE);
encrypted = dcp->encrypted ();
} else {
name = content->path(0).filename().string();
encrypted = dcp->encrypted ();
} else {
name = content->path(0).filename().string();
- kind = dcp::FEATURE;
+ kind = dcp::
ContentKind::
FEATURE;
}
}
}
}
+
void
SPLEntry::as_xml (xmlpp::Element* e)
{
void
SPLEntry::as_xml (xmlpp::Element* e)
{