projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e411084
)
Fix serialisation of the Atmos parts of a DCP.
author
Carl Hetherington
<cth@carlh.net>
Fri, 19 Jun 2020 18:29:22 +0000
(20:29 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 19 Jun 2020 18:29:22 +0000
(20:29 +0200)
src/lib/dcp_content.cc
patch
|
blob
|
history
diff --git
a/src/lib/dcp_content.cc
b/src/lib/dcp_content.cc
index d2c1df748ddc5d3dbf529a0f3ea4f7147f4d42a1..0ce4945411c3a5e5d0128df437d2dea86d8f2278 100644
(file)
--- a/
src/lib/dcp_content.cc
+++ b/
src/lib/dcp_content.cc
@@
-92,6
+92,7
@@
DCPContent::DCPContent (cxml::ConstNodePtr node, int version)
video = VideoContent::from_xml (this, node, version);
audio = AudioContent::from_xml (this, node, version);
text = TextContent::from_xml (this, node, version);
video = VideoContent::from_xml (this, node, version);
audio = AudioContent::from_xml (this, node, version);
text = TextContent::from_xml (this, node, version);
+ atmos = AtmosContent::from_xml (this, node);
for (int i = 0; i < TEXT_COUNT; ++i) {
_reference_text[i] = false;
for (int i = 0; i < TEXT_COUNT; ++i) {
_reference_text[i] = false;
@@
-328,6
+329,10
@@
DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const
i->as_xml (node);
}
i->as_xml (node);
}
+ if (atmos) {
+ atmos->as_xml (node);
+ }
+
boost::mutex::scoped_lock lm (_mutex);
node->add_child("Name")->add_child_text (_name);
node->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0");
boost::mutex::scoped_lock lm (_mutex);
node->add_child("Name")->add_child_text (_name);
node->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0");