X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.cc;h=df57f2d47143a470b1ed88ae11a6e0ac699abf4b;hb=7ab22a7aa171aec36563b8ec0b7c0b69a36094fe;hp=5474b609adfc2fdd2f43e18ad9d471465155eac4;hpb=dea824f6ff41384a5e17e23de5434cf84eccff29;p=dcpomatic.git diff --git a/src/lib/types.cc b/src/lib/types.cc index 5474b609a..df57f2d47 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,15 +21,24 @@ #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 #include "i18n.h" using std::max; using std::min; using std::string; +using std::list; using boost::shared_ptr; using dcp::raw_convert; @@ -93,38 +102,44 @@ Crop::as_xml (xmlpp::Node* node) const node->add_child("BottomCrop")->add_child_text (raw_convert (bottom)); } -CaptionType -string_to_caption_type (string s) +TextType +string_to_text_type (string s) { - if (s == "open") { - return CAPTION_OPEN; - } else if (s == "closed") { - return CAPTION_CLOSED; + 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 caption type %1", s)); + throw MetadataError (String::compose ("Unknown text type %1", s)); } } string -caption_type_to_string (CaptionType t) +text_type_to_string (TextType t) { switch (t) { - case CAPTION_OPEN: - return "open"; - case CAPTION_CLOSED: - return "closed"; + case TEXT_UNKNOWN: + return "unknown"; + case TEXT_OPEN_SUBTITLE: + return "open-subtitle"; + case TEXT_CLOSED_CAPTION: + return "closed-caption"; default: DCPOMATIC_ASSERT (false); } } string -caption_type_to_name (CaptionType t) +text_type_to_name (TextType t) { switch (t) { - case CAPTION_OPEN: - return _("Subtitles"); - case CAPTION_CLOSED: + case TEXT_UNKNOWN: + return _("Timed text"); + case TEXT_OPEN_SUBTITLE: + return _("Open subtitles"); + case TEXT_CLOSED_CAPTION: return _("Closed captions"); default: DCPOMATIC_ASSERT (false); @@ -177,3 +192,33 @@ 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); + BOOST_FOREACH (dcp::VerificationNote 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; + BOOST_FOREACH (shared_ptr j, dcp.cpls()) { + BOOST_FOREACH (shared_ptr k, j->reel_mxfs()) { + if (k->key_id()) { + encrypted = true; + } + } + } + + last_write_time = boost::filesystem::last_write_time (p); +}