*/
+#include "atmos_content.h"
#include "dcp_content.h"
#include "video_content.h"
#include "audio_content.h"
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;
BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Marker")) {
_markers[dcp::marker_from_string(i->string_attribute("type"))] = ContentTime(raw_convert<int64_t>(i->content()));
}
+
+ BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Rating")) {
+ _ratings.push_back (dcp::Rating(i));
+ }
+
+ _content_version = node->optional_string_child("ContentVersion").get_value_or("");
}
void
as->set_mapping (m);
}
+ if (examiner->has_atmos()) {
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ atmos.reset (new AtmosContent(this));
+ }
+ /* Setting length will cause calculations to be made based on edit rate, so that must
+ * be set up first otherwise hard-to-spot exceptions will be thrown.
+ */
+ atmos->set_edit_rate (examiner->atmos_edit_rate());
+ atmos->set_length (examiner->atmos_length());
+ }
+
int texts = 0;
{
boost::mutex::scoped_lock lm (_mutex);
_name = examiner->name ();
for (int i = 0; i < TEXT_COUNT; ++i) {
for (int j = 0; j < examiner->text_count(static_cast<TextType>(i)); ++j) {
- text.push_back (shared_ptr<TextContent>(new TextContent(this, static_cast<TextType>(i), static_cast<TextType>(i))));
+ shared_ptr<TextContent> c(new TextContent(this, static_cast<TextType>(i), static_cast<TextType>(i)));
+ if (i == TEXT_CLOSED_CAPTION) {
+ c->set_dcp_track (examiner->dcp_text_track(j));
+ }
+ text.push_back (c);
}
}
texts = text.size ();
for (map<dcp::Marker, dcp::Time>::const_iterator i = markers.begin(); i != markers.end(); ++i) {
_markers[i->first] = ContentTime(i->second.as_editable_units(DCPTime::HZ));
}
+ _ratings = examiner->ratings ();
+ _content_version = examiner->content_version ();
}
if (old_texts == texts) {
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");
marker->set_attribute("type", dcp::marker_to_string(i->first));
marker->add_child_text(raw_convert<string>(i->second.get()));
}
+
+ BOOST_FOREACH (dcp::Rating i, _ratings) {
+ xmlpp::Element* rating = node->add_child("Rating");
+ i.as_xml (rating);
+ }
+
+ node->add_child("ContentVersion")->add_child_text (_content_version);
}
DCPTime
static
bool check_video (shared_ptr<const Content> c)
{
- return static_cast<bool>(c->video);
+ return static_cast<bool>(c->video) && c->video->use();
}
bool
static
bool check_audio (shared_ptr<const Content> c)
{
- return static_cast<bool>(c->audio);
+ return static_cast<bool>(c->audio) && !c->audio->mapping().mapped_output_channels().empty();
}
bool