projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move get_reel_assets() out of Player, as it doesn't need to be there.
[dcpomatic.git]
/
src
/
lib
/
dcp_content.cc
diff --git
a/src/lib/dcp_content.cc
b/src/lib/dcp_content.cc
index 62b74be90cb7765db19ad34a2ad51656da271abf..193c9995aee57516e15a6a5143237c352282ef63 100644
(file)
--- a/
src/lib/dcp_content.cc
+++ b/
src/lib/dcp_content.cc
@@
-148,7
+148,7
@@
DCPContent::DCPContent (cxml::ConstNodePtr node, int version)
auto ck = node->optional_string_child("ContentKind");
if (ck) {
auto ck = node->optional_string_child("ContentKind");
if (ck) {
- _content_kind = dcp::
content_kind_from_string
(*ck);
+ _content_kind = dcp::
ContentKind::from_name
(*ck);
}
_cpl = node->optional_string_child("CPL");
for (auto i: node->node_children("ReelLength")) {
}
_cpl = node->optional_string_child("CPL");
for (auto i: node->node_children("ReelLength")) {
@@
-388,7
+388,7
@@
DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const
}
node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
if (_content_kind) {
}
node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
if (_content_kind) {
- node->add_child("ContentKind")->add_child_text(
dcp::content_kind_to_string(*_content_kind
));
+ node->add_child("ContentKind")->add_child_text(
_content_kind->name(
));
}
if (_cpl) {
node->add_child("CPL")->add_child_text (_cpl.get ());
}
if (_cpl) {
node->add_child("CPL")->add_child_text (_cpl.get ());