X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fcpl.cc;h=3eeb102c196b28ac83af9736ec1c997800ddded9;hb=5ad493e6900f621284748fe50b3f60f67929ffc2;hp=0abf864af35570b18058c3ab43c2acc8eef22c4a;hpb=1eb9ba017214698de3fd41de5291604b4fe839c5;p=libdcp.git

diff --git a/src/cpl.cc b/src/cpl.cc
index 0abf864a..3eeb102c 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -40,6 +40,7 @@
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_subtitle_asset.h"
+#include "reel_closed_caption_asset.h"
 #include "reel_atmos_asset.h"
 #include "local_time.h"
 #include "dcp_assert.h"
@@ -62,17 +63,17 @@ static string const cpl_interop_ns = "http://www.digicine.com/PROTO-ASDCP-CPL-20
 static string const cpl_smpte_ns   = "http://www.smpte-ra.org/schemas/429-7/2006/CPL";
 
 CPL::CPL (string annotation_text, ContentKind content_kind)
-	: _annotation_text (annotation_text)
-	/* default _content_title_text to _annotation_text */
-	, _content_title_text (annotation_text)
+	/* default _content_title_text to annotation_text */
+	: _content_title_text (annotation_text)
 	, _content_kind (content_kind)
-	, _content_version_id ("urn:uuid:" + make_uuid ())
 {
+	_metadata.annotation_text = annotation_text;
 	/* default _content_version_id to a random ID and _content_version_label to
 	   a random ID and the current time.
 	*/
-	_content_version_id = "urn:uuid:" + make_uuid();
-	_content_version_label_text = _content_version_id + LocalTime().as_string ();
+	string const uuid = make_uuid();
+	_content_version_id = "urn:uuid:" + uuid;
+	_content_version_label_text = uuid + LocalTime().as_string ();
 }
 
 /** Construct a CPL object from a XML file */
@@ -92,7 +93,7 @@ CPL::CPL (boost::filesystem::path file)
 	}
 
 	_id = remove_urn_uuid (f.string_child ("Id"));
-	_annotation_text = f.optional_string_child ("AnnotationText").get_value_or ("");
+	_metadata.annotation_text = f.optional_string_child ("AnnotationText").get_value_or ("");
 	_metadata.issuer = f.optional_string_child ("Issuer").get_value_or ("");
 	_metadata.creator = f.optional_string_child ("Creator").get_value_or ("");
 	_metadata.issue_date = f.string_child ("IssueDate");
@@ -144,7 +145,7 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<cons
 	}
 
 	root->add_child("Id")->add_child_text ("urn:uuid:" + _id);
-	root->add_child("AnnotationText")->add_child_text (_annotation_text);
+	root->add_child("AnnotationText")->add_child_text (_metadata.annotation_text);
 	root->add_child("IssueDate")->add_child_text (_metadata.issue_date);
 	root->add_child("Issuer")->add_child_text (_metadata.issuer);
 	root->add_child("Creator")->add_child_text (_metadata.creator);
@@ -163,16 +164,43 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<cons
 		i->write_to_cpl (reel_list, standard);
 	}
 
+	indent (root, 0);
+
 	if (signer) {
 		signer->sign (root, standard);
 	}
 
-	/* This must not be the _formatted version otherwise signature digests will be wrong */
-	doc.write_to_file (file.string (), "UTF-8");
+	doc.write_to_file_formatted (file.string(), "UTF-8");
 
 	set_file (file);
 }
 
+list<shared_ptr<ReelAsset> >
+CPL::reel_assets ()
+{
+	list<shared_ptr<ReelAsset> > c;
+
+	BOOST_FOREACH (shared_ptr<Reel> i, _reels) {
+		if (i->main_picture ()) {
+			c.push_back (i->main_picture());
+		}
+		if (i->main_sound ()) {
+			c.push_back (i->main_sound());
+		}
+		if (i->main_subtitle ()) {
+			c.push_back (i->main_subtitle());
+		}
+		BOOST_FOREACH (shared_ptr<ReelClosedCaptionAsset> j, i->closed_captions()) {
+			c.push_back (j);
+		}
+		if (i->atmos ()) {
+			c.push_back (i->atmos());
+		}
+	}
+
+	return c;
+}
+
 list<shared_ptr<const ReelAsset> >
 CPL::reel_assets () const
 {
@@ -188,6 +216,9 @@ CPL::reel_assets () const
 		if (i->main_subtitle ()) {
 			c.push_back (i->main_subtitle());
 		}
+		BOOST_FOREACH (shared_ptr<ReelClosedCaptionAsset> j, i->closed_captions()) {
+			c.push_back (j);
+		}
 		if (i->atmos ()) {
 			c.push_back (i->atmos());
 		}
@@ -204,8 +235,8 @@ CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler not
 		return false;
 	}
 
-	if (_annotation_text != other_cpl->_annotation_text && !opt.cpl_annotation_texts_can_differ) {
-		string const s = "CPL: annotation texts differ: " + _annotation_text + " vs " + other_cpl->_annotation_text + "\n";
+	if (_metadata.annotation_text != other_cpl->_metadata.annotation_text && !opt.cpl_annotation_texts_can_differ) {
+		string const s = "CPL: annotation texts differ: " + _metadata.annotation_text + " vs " + other_cpl->_metadata.annotation_text + "\n";
 		note (DCP_ERROR, s);
 		return false;
 	}
@@ -269,6 +300,12 @@ CPL::resolve_refs (list<shared_ptr<Asset> > assets)
 
 string
 CPL::pkl_type (Standard standard) const
+{
+	return static_pkl_type (standard);
+}
+
+string
+CPL::static_pkl_type (Standard standard)
 {
 	switch (standard) {
 	case INTEROP: