X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.cc;h=68d97b8ff614b84617fc1779e9747da5ebf54b47;hb=9b946fc5250eff5a5dd4a661896916fcd5d9bd4b;hp=b193ac9cf90400699151495890ae5d05ff2a5fb2;hpb=24dcab1d4d8d7a28a939c7c4d786197684f155f6;p=dcpomatic.git diff --git a/src/lib/types.cc b/src/lib/types.cc index b193ac9cf..68d97b8ff 100644 --- a/src/lib/types.cc +++ b/src/lib/types.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -21,8 +21,15 @@ #include "types.h" #include "compose.hpp" #include "dcpomatic_assert.h" +#include "warnings.h" #include +#include +#include +#include +#include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include #include "i18n.h" @@ -30,7 +37,8 @@ using std::max; using std::min; using std::string; -using boost::shared_ptr; +using std::list; +using std::shared_ptr; using dcp::raw_convert; bool operator== (Crop const & a, Crop const & b) @@ -100,7 +108,7 @@ string_to_text_type (string s) return TEXT_UNKNOWN; } else if (s == "open-subtitle") { return TEXT_OPEN_SUBTITLE; - } else if (s == "closed") { + } else if (s == "closed-caption") { return TEXT_CLOSED_CAPTION; } else { throw MetadataError (String::compose ("Unknown text type %1", s)); @@ -183,3 +191,68 @@ string_to_video_frame_type (string s) DCPOMATIC_ASSERT (false); } + +CPLSummary::CPLSummary (boost::filesystem::path p) + : dcp_directory (p.leaf().string()) +{ + dcp::DCP dcp (p); + + list notes; + dcp.read (¬es); + for (auto i: notes) { + if (i.code() != dcp::VerificationNote::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; + for (auto j: dcp.cpls()) { + for (auto k: j->reel_mxfs()) { + if (k->key_id()) { + encrypted = true; + } + } + } + + last_write_time = boost::filesystem::last_write_time (p); +} + + +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; +} +