projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in log message.
[dcpomatic.git]
/
src
/
lib
/
spl_entry.h
diff --git
a/src/lib/spl_entry.h
b/src/lib/spl_entry.h
index 2650371c45003d9631e95edbe6028fc595dd0681..6fa3dd32cacc22887f6d71419735ee832f838c4d 100644
(file)
--- a/
src/lib/spl_entry.h
+++ b/
src/lib/spl_entry.h
@@
-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,11
+18,14
@@
*/
*/
+
#ifndef DCPOMATIC_SPL_ENTRY_H
#define DCPOMATIC_SPL_ENTRY_H
#ifndef DCPOMATIC_SPL_ENTRY_H
#define DCPOMATIC_SPL_ENTRY_H
+
#include <libcxml/cxml.h>
#include <libcxml/cxml.h>
-#include <dcp/types.h>
+#include <dcp/content_kind.h>
+
namespace xmlpp {
class Element;
namespace xmlpp {
class Element;
@@
-30,10
+33,11
@@
namespace xmlpp {
class Content;
class Content;
+
class SPLEntry
{
public:
class SPLEntry
{
public:
- SPLEntry (std::shared_ptr<Content> c
ontent
);
+ SPLEntry (std::shared_ptr<Content> c);
void as_xml (xmlpp::Element* e);
void as_xml (xmlpp::Element* e);
@@
-43,11
+47,12
@@
public:
std::string digest;
/** CPL ID */
std::string id;
std::string digest;
/** CPL ID */
std::string id;
-
dcp::ContentKind
kind;
+
boost::optional<dcp::ContentKind>
kind;
bool encrypted;
private:
void construct (std::shared_ptr<Content> content);
};
bool encrypted;
private:
void construct (std::shared_ptr<Content> content);
};
+
#endif
#endif