X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.cc;h=fd4b8906ce19e5c67e2c8e349028369a277e3f27;hb=94d5ba335224db075a95a76654f732ef54a4eabd;hp=9aba915e80f56b8976abe566c0a823d6be531e72;hpb=cb6729aa79b555b219974207fbe2ff0510f9d3ea;p=dcpomatic.git diff --git a/src/lib/types.cc b/src/lib/types.cc index 9aba915e8..fd4b8906c 100644 --- a/src/lib/types.cc +++ b/src/lib/types.cc @@ -21,15 +21,15 @@ #include "types.h" #include "compose.hpp" #include "dcpomatic_assert.h" -#include "warnings.h" -#include #include #include -#include +#include #include -DCPOMATIC_DISABLE_WARNINGS +#include +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include "i18n.h" @@ -42,75 +42,16 @@ 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 node) -{ - left = node->number_child ("LeftCrop"); - right = node->number_child ("RightCrop"); - top = node->number_child ("TopCrop"); - bottom = node->number_child ("BottomCrop"); -} - -void -Crop::as_xml (xmlpp::Node* node) const -{ - node->add_child("LeftCrop")->add_child_text (raw_convert (left)); - node->add_child("RightCrop")->add_child_text (raw_convert (right)); - node->add_child("TopCrop")->add_child_text (raw_convert (top)); - node->add_child("BottomCrop")->add_child_text (raw_convert (bottom)); -} 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)); } @@ -120,11 +61,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); @@ -135,64 +76,17 @@ 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); } } -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()) { @@ -201,7 +95,7 @@ CPLSummary::CPLSummary (boost::filesystem::path p) vector notes; dcp.read (¬es); for (auto i: notes) { - if (i.code() != dcp::VerificationNote::EXTERNAL_ASSET) { + 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)); } @@ -213,47 +107,16 @@ CPLSummary::CPLSummary (boost::filesystem::path p) encrypted = false; for (auto j: dcp.cpls()) { - for (auto k: j->reel_mxfs()) { - if (k->key_id()) { + 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 VIDEO_RANGE_FULL: - return "full"; - case VIDEO_RANGE_VIDEO: - return "video"; - default: - DCPOMATIC_ASSERT (false); - } -} - - -VideoRange -string_to_video_range (string s) -{ - if (s == "full") { - return VIDEO_RANGE_FULL; - } else if (s == "video") { - return VIDEO_RANGE_VIDEO; - } - - DCPOMATIC_ASSERT (false); - return VIDEO_RANGE_FULL; -} -