#include <dcp/dcp.h>
#include <dcp/raw_convert.h>
#include <dcp/exceptions.h>
+#include <dcp/reel_closed_caption_asset.h>
#include <dcp/reel_picture_asset.h>
+#include <dcp/reel_subtitle_asset.h>
#include <dcp/reel.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
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
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
}
BOOST_FOREACH (shared_ptr<dcp::Reel> 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<dcp::ReelClosedCaptionAsset> 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);
}