X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.cc;h=9519b309729db5ed323ccdd7bcd8ef0ad93a9d1d;hb=8902a7adb63e2dac24e877ed1035bf344397c260;hp=d25c9aba4bf2557072704e7f3236a9b358f9a910;hpb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb;p=dcpomatic.git

diff --git a/src/lib/types.cc b/src/lib/types.cc
index d25c9aba4..9519b3097 100644
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,14 +22,20 @@
 #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/reel_asset.h>
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
+#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
 using std::max;
 using std::min;
 using std::string;
+using std::list;
 using boost::shared_ptr;
 using dcp::raw_convert;
 
@@ -96,9 +102,11 @@ Crop::as_xml (xmlpp::Node* node) const
 TextType
 string_to_text_type (string s)
 {
-	if (s == "open-subtitle") {
+	if (s == "unknown") {
+		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));
@@ -109,6 +117,8 @@ 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:
@@ -122,6 +132,8 @@ 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:
@@ -177,3 +189,29 @@ 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<dcp::VerificationNote> notes;
+	dcp.read (&notes);
+	if (!notes.empty()) {
+		throw dcp::ReadError(dcp::note_to_string(notes.front()));
+	}
+
+	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::ReelMXF> k, j->reel_mxfs()) {
+			if (k->key_id()) {
+				encrypted = true;
+			}
+		}
+	}
+
+	last_write_time = boost::filesystem::last_write_time (p);
+}