projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapt Butler to keep a buffer of main and sign language video types.
[dcpomatic.git]
/
src
/
lib
/
spl_entry.h
diff --git
a/src/lib/spl_entry.h
b/src/lib/spl_entry.h
index 740082eaf0f9a3d6e0d56bcc222024fe1ec6b8d1..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,12
+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 <boost/shared_ptr.hpp>
+#include <dcp/
content_kind
.h>
+
namespace xmlpp {
class Element;
namespace xmlpp {
class Element;
@@
-31,24
+33,26
@@
namespace xmlpp {
class Content;
class Content;
+
class SPLEntry
{
public:
class SPLEntry
{
public:
- SPLEntry (
boost::shared_ptr<Content> content
);
+ SPLEntry (
std::shared_ptr<Content> c
);
void as_xml (xmlpp::Element* e);
void as_xml (xmlpp::Element* e);
-
boost
::shared_ptr<Content> content;
+
std
::shared_ptr<Content> content;
std::string name;
/** Digest of this content */
std::string digest;
/** CPL ID */
std::string id;
std::string name;
/** Digest of this content */
std::string digest;
/** CPL ID */
std::string id;
-
dcp::ContentKind
kind;
+
boost::optional<dcp::ContentKind>
kind;
bool encrypted;
private:
bool encrypted;
private:
- void construct (
boost
::shared_ptr<Content> content);
+ void construct (
std
::shared_ptr<Content> content);
};
};
+
#endif
#endif