X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=d4bd58e584099c9d937f5209e97639dbeb2a0f85;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=00ffb390c2c501970e71f20eb6de4cf90493b4c0;hpb=09860271bb6d03b3937c08bffb4c672697f6d711;p=dcpomatic.git diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 00ffb390c..d4bd58e58 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -35,7 +35,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -51,11 +53,14 @@ using std::pair; using std::vector; using std::list; using std::map; -using boost::shared_ptr; +using std::shared_ptr; using boost::scoped_ptr; using boost::optional; using boost::function; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::raw_convert; using namespace dcpomatic; @@ -158,24 +163,39 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version) _ratings.push_back (dcp::Rating(i)); } - _content_version = node->optional_string_child("ContentVersion").get_value_or(""); + BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("ContentVersion")) { + _content_versions.push_back (i->content()); + } } void DCPContent::read_directory (boost::filesystem::path p) { - read_sub_directory (p); + using namespace boost::filesystem; bool have_assetmap = false; - BOOST_FOREACH (boost::filesystem::path i, paths()) { - if (i.filename() == "ASSETMAP" || i.filename() == "ASSETMAP.xml") { + bool have_metadata = false; + + for (directory_iterator i(p); i != directory_iterator(); ++i) { + if (i->path().filename() == "ASSETMAP" || i->path().filename() == "ASSETMAP.xml") { have_assetmap = true; + } else if (i->path().filename() == "metadata.xml") { + have_metadata = true; } } if (!have_assetmap) { - throw DCPError ("No ASSETMAP or ASSETMAP.xml file found: is this a DCP?"); + if (!have_metadata) { + throw DCPError ("No ASSETMAP or ASSETMAP.xml file found: is this a DCP?"); + } else { + throw DCPError ( + "This looks like a DCP-o-matic project folder, which cannot be added to a different project. " + "Choose the DCP directory inside the DCP-o-matic project folder if that's what you want to import." + ); + } } + + read_sub_directory (p); } void @@ -200,7 +220,6 @@ DCPContent::examine (shared_ptr film, shared_ptr job) bool const needed_assets = needs_assets (); bool const needed_kdm = needs_kdm (); string const old_name = name (); - int const old_texts = text.size (); ChangeSignaller cc_texts (this, DCPContentProperty::TEXTS); ChangeSignaller cc_assets (this, DCPContentProperty::NEEDS_ASSETS); @@ -247,20 +266,21 @@ DCPContent::examine (shared_ptr film, shared_ptr job) atmos->set_length (examiner->atmos_length()); } - int texts = 0; + list > new_text; + for (int i = 0; i < TEXT_COUNT; ++i) { + for (int j = 0; j < examiner->text_count(static_cast(i)); ++j) { + shared_ptr c(new TextContent(this, static_cast(i), static_cast(i))); + if (i == TEXT_CLOSED_CAPTION) { + c->set_dcp_track (examiner->dcp_text_track(j)); + } + new_text.push_back (c); + } + } + { boost::mutex::scoped_lock lm (_mutex); + text = new_text; _name = examiner->name (); - for (int i = 0; i < TEXT_COUNT; ++i) { - for (int j = 0; j < examiner->text_count(static_cast(i)); ++j) { - shared_ptr c(new TextContent(this, static_cast(i), static_cast(i))); - if (i == TEXT_CLOSED_CAPTION) { - c->set_dcp_track (examiner->dcp_text_track(j)); - } - text.push_back (c); - } - } - texts = text.size (); _encrypted = examiner->encrypted (); _needs_assets = examiner->needs_assets (); _kdm_valid = examiner->kdm_valid (); @@ -274,11 +294,7 @@ DCPContent::examine (shared_ptr film, shared_ptr job) _markers[i->first] = ContentTime(i->second.as_editable_units(DCPTime::HZ)); } _ratings = examiner->ratings (); - _content_version = examiner->content_version (); - } - - if (old_texts == texts) { - cc_texts.abort (); + _content_versions = examiner->content_versions (); } if (needed_assets == needs_assets()) { @@ -390,7 +406,9 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const i.as_xml (rating); } - node->add_child("ContentVersion")->add_child_text (_content_version); + BOOST_FOREACH (string i, _content_versions) { + node->add_child("ContentVersion")->add_child_text(i); + } } DCPTime @@ -718,18 +736,39 @@ DCPContent::can_reference_text (shared_ptr film, TextType type, stri } BOOST_FOREACH (shared_ptr i, decoder->reels()) { - if (type == TEXT_OPEN_SUBTITLE && !i->main_subtitle()) { - /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - why_not = _("it does not have open subtitles in all its reels."); - return false; + if (type == TEXT_OPEN_SUBTITLE) { + if (!i->main_subtitle()) { + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("it does not have open subtitles in all its reels."); + return false; + } else if (i->main_subtitle()->entry_point().get_value_or(0) != 0) { + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("one if its subtitle reels has a non-zero entry point so it must be re-written."); + return false; + } } - if (type == TEXT_CLOSED_CAPTION && i->closed_captions().empty()) { - /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - why_not = _("it does not have closed captions in all its reels."); - return false; + if (type == TEXT_CLOSED_CAPTION) { + if (i->closed_captions().empty()) { + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("it does not have closed captions in all its reels."); + return false; + } + BOOST_FOREACH (shared_ptr j, i->closed_captions()) { + if (j->entry_point().get_value_or(0) != 0) { + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("one if its closed caption has a non-zero entry point so it must be re-written."); + return false; + } + } } } + if (trim_start() != dcpomatic::ContentTime()) { + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("it has a start trim so its subtitles or closed captions must be re-written."); + return false; + } + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " return can_reference (film, bind (&check_text, _1), _("it overlaps other text content; remove the other content."), why_not); }