X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.cc;h=228ebf28f6d47bc442e12d8b4f43540c66ae1189;hb=423996af81218d48dbeaccef52ff822e02c43128;hp=9519b309729db5ed323ccdd7bcd8ef0ad93a9d1d;hpb=b029cb06c4e0fca1fad9fecd78939efe5532fa9a;p=dcpomatic.git diff --git a/src/lib/types.cc b/src/lib/types.cc index 9519b3097..228ebf28f 100644 --- a/src/lib/types.cc +++ b/src/lib/types.cc @@ -21,14 +21,16 @@ #include "types.h" #include "compose.hpp" #include "dcpomatic_assert.h" +#include "warnings.h" #include #include #include -#include +#include #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include -#include #include "i18n.h" @@ -36,7 +38,8 @@ using std::max; using std::min; using std::string; using std::list; -using boost::shared_ptr; +using std::shared_ptr; +using std::vector; using dcp::raw_convert; bool operator== (Crop const & a, Crop const & b) @@ -56,9 +59,9 @@ string resolution_to_string (Resolution r) { switch (r) { - case RESOLUTION_2K: + case Resolution::TWO_K: return "2K"; - case RESOLUTION_4K: + case Resolution::FOUR_K: return "4K"; } @@ -71,15 +74,15 @@ Resolution string_to_resolution (string s) { if (s == "2K") { - return RESOLUTION_2K; + return Resolution::TWO_K; } if (s == "4K") { - return RESOLUTION_4K; + return Resolution::FOUR_K; } DCPOMATIC_ASSERT (false); - return RESOLUTION_2K; + return Resolution::TWO_K; } Crop::Crop (shared_ptr node) @@ -103,11 +106,11 @@ TextType string_to_text_type (string s) { if (s == "unknown") { - return TEXT_UNKNOWN; + return TextType::UNKNOWN; } else if (s == "open-subtitle") { - return TEXT_OPEN_SUBTITLE; + return TextType::OPEN_SUBTITLE; } else if (s == "closed-caption") { - return TEXT_CLOSED_CAPTION; + return TextType::CLOSED_CAPTION; } else { throw MetadataError (String::compose ("Unknown text type %1", s)); } @@ -117,11 +120,11 @@ string text_type_to_string (TextType t) { switch (t) { - case TEXT_UNKNOWN: + case TextType::UNKNOWN: return "unknown"; - case TEXT_OPEN_SUBTITLE: + case TextType::OPEN_SUBTITLE: return "open-subtitle"; - case TEXT_CLOSED_CAPTION: + case TextType::CLOSED_CAPTION: return "closed-caption"; default: DCPOMATIC_ASSERT (false); @@ -132,11 +135,11 @@ string text_type_to_name (TextType t) { switch (t) { - case TEXT_UNKNOWN: + case TextType::UNKNOWN: return _("Timed text"); - case TEXT_OPEN_SUBTITLE: + case TextType::OPEN_SUBTITLE: return _("Open subtitles"); - case TEXT_CLOSED_CAPTION: + case TextType::CLOSED_CAPTION: return _("Closed captions"); default: DCPOMATIC_ASSERT (false); @@ -147,19 +150,19 @@ string video_frame_type_to_string (VideoFrameType t) { switch (t) { - case VIDEO_FRAME_TYPE_2D: + case VideoFrameType::TWO_D: return "2d"; - case VIDEO_FRAME_TYPE_3D: + case VideoFrameType::THREE_D: return "3d"; - case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: + case VideoFrameType::THREE_D_LEFT_RIGHT: return "3d-left-right"; - case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM: + case VideoFrameType::THREE_D_TOP_BOTTOM: return "3d-top-bottom"; - case VIDEO_FRAME_TYPE_3D_ALTERNATE: + case VideoFrameType::THREE_D_ALTERNATE: return "3d-alternate"; - case VIDEO_FRAME_TYPE_3D_LEFT: + case VideoFrameType::THREE_D_LEFT: return "3d-left"; - case VIDEO_FRAME_TYPE_3D_RIGHT: + case VideoFrameType::THREE_D_RIGHT: return "3d-right"; default: DCPOMATIC_ASSERT (false); @@ -172,19 +175,19 @@ VideoFrameType string_to_video_frame_type (string s) { if (s == "2d") { - return VIDEO_FRAME_TYPE_2D; + return VideoFrameType::TWO_D; } else if (s == "3d") { - return VIDEO_FRAME_TYPE_3D; + return VideoFrameType::THREE_D; } else if (s == "3d-left-right") { - return VIDEO_FRAME_TYPE_3D_LEFT_RIGHT; + return VideoFrameType::THREE_D_LEFT_RIGHT; } else if (s == "3d-top-bottom") { - return VIDEO_FRAME_TYPE_3D_TOP_BOTTOM; + return VideoFrameType::THREE_D_TOP_BOTTOM; } else if (s == "3d-alternate") { - return VIDEO_FRAME_TYPE_3D_ALTERNATE; + return VideoFrameType::THREE_D_ALTERNATE; } else if (s == "3d-left") { - return VIDEO_FRAME_TYPE_3D_LEFT; + return VideoFrameType::THREE_D_LEFT; } else if (s == "3d-right") { - return VIDEO_FRAME_TYPE_3D_RIGHT; + return VideoFrameType::THREE_D_RIGHT; } DCPOMATIC_ASSERT (false); @@ -194,10 +197,14 @@ CPLSummary::CPLSummary (boost::filesystem::path p) : dcp_directory (p.leaf().string()) { dcp::DCP dcp (p); - list notes; + + vector notes; dcp.read (¬es); - if (!notes.empty()) { - throw dcp::ReadError(dcp::note_to_string(notes.front())); + 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(); @@ -205,13 +212,50 @@ CPLSummary::CPLSummary (boost::filesystem::path p) cpl_file = dcp.cpls().front()->file().get(); encrypted = false; - BOOST_FOREACH (shared_ptr j, dcp.cpls()) { - BOOST_FOREACH (shared_ptr k, j->reel_mxfs()) { - if (k->key_id()) { + for (auto j: dcp.cpls()) { + for (auto k: j->reel_file_assets()) { + if (k->encrypted()) { encrypted = true; } } } - last_write_time = boost::filesystem::last_write_time (p); + boost::system::error_code ec; + auto last_write = boost::filesystem::last_write_time (p, ec); + last_write_time = ec ? 0 : last_write; +} + + +bool operator== (NamedChannel const& a, NamedChannel const& b) +{ + return a.name == b.name && a.index == b.index; } + + +string +video_range_to_string (VideoRange r) +{ + switch (r) { + case VideoRange::FULL: + return "full"; + case VideoRange::VIDEO: + return "video"; + default: + DCPOMATIC_ASSERT (false); + } +} + + +VideoRange +string_to_video_range (string s) +{ + if (s == "full") { + return VideoRange::FULL; + } else if (s == "video") { + return VideoRange::VIDEO; + } + + DCPOMATIC_ASSERT (false); + return VideoRange::FULL; +} +