#include "types.h"
#include "compose.hpp"
#include "dcpomatic_assert.h"
-#include <dcp/raw_convert.h>
#include <dcp/cpl.h>
#include <dcp/dcp.h>
-#include <dcp/reel_mxf.h>
+#include <dcp/filesystem.h>
+#include <dcp/raw_convert.h>
#include <dcp/reel_asset.h>
+#include <dcp/reel_file_asset.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
#include <libcxml/cxml.h>
-#include <boost/foreach.hpp>
#include "i18n.h"
using std::max;
using std::min;
using std::string;
-using boost::shared_ptr;
+using std::list;
+using std::shared_ptr;
+using std::vector;
using dcp::raw_convert;
-bool operator== (Crop const & a, Crop const & b)
-{
- return (a.left == b.left && a.right == b.right && a.top == b.top && a.bottom == b.bottom);
-}
-
-bool operator!= (Crop const & a, Crop const & b)
-{
- return !(a == b);
-}
-
-/** @param r Resolution.
- * @return Untranslated string representation.
- */
-string
-resolution_to_string (Resolution r)
-{
- switch (r) {
- case RESOLUTION_2K:
- return "2K";
- case RESOLUTION_4K:
- return "4K";
- }
-
- DCPOMATIC_ASSERT (false);
- return "";
-}
-
-
-Resolution
-string_to_resolution (string s)
-{
- if (s == "2K") {
- return RESOLUTION_2K;
- }
-
- if (s == "4K") {
- return RESOLUTION_4K;
- }
-
- DCPOMATIC_ASSERT (false);
- return RESOLUTION_2K;
-}
-
-Crop::Crop (shared_ptr<cxml::Node> node)
-{
- left = node->number_child<int> ("LeftCrop");
- right = node->number_child<int> ("RightCrop");
- top = node->number_child<int> ("TopCrop");
- bottom = node->number_child<int> ("BottomCrop");
-}
-
-void
-Crop::as_xml (xmlpp::Node* node) const
-{
- node->add_child("LeftCrop")->add_child_text (raw_convert<string> (left));
- node->add_child("RightCrop")->add_child_text (raw_convert<string> (right));
- node->add_child("TopCrop")->add_child_text (raw_convert<string> (top));
- node->add_child("BottomCrop")->add_child_text (raw_convert<string> (bottom));
-}
-
-TextType
-string_to_text_type (string s)
-{
- if (s == "unknown") {
- return TEXT_UNKNOWN;
- } else if (s == "open-subtitle") {
- return TEXT_OPEN_SUBTITLE;
- } else if (s == "closed-caption") {
- return TEXT_CLOSED_CAPTION;
- } else {
- throw MetadataError (String::compose ("Unknown text type %1", s));
- }
-}
-
-string
-text_type_to_string (TextType t)
-{
- switch (t) {
- case TEXT_UNKNOWN:
- return "unknown";
- case TEXT_OPEN_SUBTITLE:
- return "open-subtitle";
- case TEXT_CLOSED_CAPTION:
- return "closed-caption";
- default:
- DCPOMATIC_ASSERT (false);
- }
-}
-
-string
-text_type_to_name (TextType t)
-{
- switch (t) {
- case TEXT_UNKNOWN:
- return _("Timed text");
- case TEXT_OPEN_SUBTITLE:
- return _("Open subtitles");
- case TEXT_CLOSED_CAPTION:
- return _("Closed captions");
- default:
- DCPOMATIC_ASSERT (false);
- }
-}
-
-string
-video_frame_type_to_string (VideoFrameType t)
-{
- switch (t) {
- case VIDEO_FRAME_TYPE_2D:
- return "2d";
- case VIDEO_FRAME_TYPE_3D:
- return "3d";
- case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
- return "3d-left-right";
- case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
- return "3d-top-bottom";
- case VIDEO_FRAME_TYPE_3D_ALTERNATE:
- return "3d-alternate";
- case VIDEO_FRAME_TYPE_3D_LEFT:
- return "3d-left";
- case VIDEO_FRAME_TYPE_3D_RIGHT:
- return "3d-right";
- default:
- DCPOMATIC_ASSERT (false);
- }
-
- DCPOMATIC_ASSERT (false);
-}
-
-VideoFrameType
-string_to_video_frame_type (string s)
-{
- if (s == "2d") {
- return VIDEO_FRAME_TYPE_2D;
- } else if (s == "3d") {
- return VIDEO_FRAME_TYPE_3D;
- } else if (s == "3d-left-right") {
- return VIDEO_FRAME_TYPE_3D_LEFT_RIGHT;
- } else if (s == "3d-top-bottom") {
- return VIDEO_FRAME_TYPE_3D_TOP_BOTTOM;
- } else if (s == "3d-alternate") {
- return VIDEO_FRAME_TYPE_3D_ALTERNATE;
- } else if (s == "3d-left") {
- return VIDEO_FRAME_TYPE_3D_LEFT;
- } else if (s == "3d-right") {
- return VIDEO_FRAME_TYPE_3D_RIGHT;
- }
-
- DCPOMATIC_ASSERT (false);
-}
CPLSummary::CPLSummary (boost::filesystem::path p)
- : dcp_directory (p.leaf().string())
+ : dcp_directory(p.filename().string())
{
dcp::DCP dcp (p);
- dcp.read ();
+
+ vector<dcp::VerificationNote> notes;
+ dcp.read (¬es);
+ for (auto i: notes) {
+ if (i.code() != dcp::VerificationNote::Code::EXTERNAL_ASSET) {
+ /* It's not just a warning about this DCP being a VF */
+ throw dcp::ReadError(dcp::note_to_string(i));
+ }
+ }
cpl_id = dcp.cpls().front()->id();
cpl_annotation_text = dcp.cpls().front()->annotation_text();
cpl_file = dcp.cpls().front()->file().get();
encrypted = false;
- BOOST_FOREACH (shared_ptr<dcp::CPL> j, dcp.cpls()) {
- BOOST_FOREACH (shared_ptr<const dcp::ReelAsset> k, j->reel_assets()) {
- shared_ptr<const dcp::ReelMXF> mxf = boost::dynamic_pointer_cast<const dcp::ReelMXF> (k);
- if (mxf && mxf->key_id()) {
+ for (auto j: dcp.cpls()) {
+ for (auto k: j->reel_file_assets()) {
+ if (k->encrypted()) {
encrypted = true;
}
}
}
+
+ boost::system::error_code ec;
+ auto last_write = dcp::filesystem::last_write_time(p, ec);
+ last_write_time = ec ? 0 : last_write;
}
+
+