X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fcpl.cc;h=5f3d0291482861d9d82886669f827d21853fec58;hb=d97e1600057d796c4163cecf28f9f04a6ea6402b;hp=d7f3a79a80cb8c5e44fc17c9b9d93bcb07f58ed7;hpb=da1cb49ee9fd13322aa643d6d062b79413be6473;p=libdcp.git

diff --git a/src/cpl.cc b/src/cpl.cc
index d7f3a79a..5f3d0291 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,14 +21,16 @@
 #include "util.h"
 #include "reel.h"
 #include "metadata.h"
-#include "signer.h"
+#include "certificate_chain.h"
 #include "xml.h"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_subtitle_asset.h"
 #include "local_time.h"
+#include "dcp_assert.h"
 #include "compose.hpp"
 #include <libxml/parser.h>
+#include <boost/foreach.hpp>
 
 using std::string;
 using std::stringstream;
@@ -49,11 +51,11 @@ CPL::CPL (string annotation_text, ContentKind content_kind)
 	, _content_kind (content_kind)
 	, _content_version_id ("urn:uuid:" + make_uuid ())
 {
-	/* default _content_version_id to and _content_version_label to
+	/* 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() + LocalTime().as_string ();
-	_content_version_label_text = _content_version_id;
+	_content_version_id = "urn:uuid:" + make_uuid();
+	_content_version_label_text = _content_version_id + LocalTime().as_string ();
 }
 
 /** Construct a CPL object from a XML file */
@@ -105,7 +107,7 @@ CPL::add (boost::shared_ptr<Reel> reel)
  *  @param signer Signer to sign the CPL, or 0 to add no signature.
  */
 void
-CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<const Signer> signer) const
+CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<const CertificateChain> signer) const
 {
 	xmlpp::Document doc;
 	xmlpp::Element* root;
@@ -118,7 +120,7 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<cons
 	if (signer) {
 		root->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "dsig");
 	}
-	
+
 	root->add_child("Id")->add_child_text ("urn:uuid:" + _id);
 	root->add_child("AnnotationText")->add_child_text (_annotation_text);
 	root->add_child("IssueDate")->add_child_text (_metadata.issue_date);
@@ -134,9 +136,9 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<cons
 	root->add_child("RatingList");
 
 	xmlpp::Element* reel_list = root->add_child ("ReelList");
-	
-	for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
-		(*i)->write_to_cpl (reel_list, standard);
+
+	BOOST_FOREACH (shared_ptr<Reel> i, _reels) {
+		i->write_to_cpl (reel_list, standard);
 	}
 
 	if (signer) {
@@ -154,29 +156,29 @@ CPL::reel_assets () const
 {
 	list<shared_ptr<const ReelAsset> > c;
 
-	for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
-		if ((*i)->main_picture ()) {
-			c.push_back ((*i)->main_picture());
+	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_sound ()) {
+			c.push_back (i->main_sound());
 		}
-		if ((*i)->main_subtitle ()) {
-			c.push_back ((*i)->main_subtitle());
+		if (i->main_subtitle ()) {
+			c.push_back (i->main_subtitle());
 		}
 	}
 
 	return c;
 }
-	
+
 bool
-CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
+CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
 {
 	shared_ptr<const CPL> other_cpl = dynamic_pointer_cast<const CPL> (other);
 	if (!other_cpl) {
 		return false;
 	}
-	
+
 	if (_annotation_text != other_cpl->_annotation_text && !opt.cpl_annotation_texts_can_differ) {
 		stringstream s;
 		s << "CPL: annotation texts differ: " << _annotation_text << " vs " << other_cpl->_annotation_text << "\n";
@@ -193,10 +195,10 @@ CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function
 		note (DCP_ERROR, String::compose ("CPL: reel counts differ (%1 vs %2)", _reels.size(), other_cpl->_reels.size()));
 		return false;
 	}
-	
+
 	list<shared_ptr<Reel> >::const_iterator a = _reels.begin ();
 	list<shared_ptr<Reel> >::const_iterator b = other_cpl->_reels.begin ();
-	
+
 	while (a != _reels.end ()) {
 		if (!(*a)->equals (*b, opt, note)) {
 			return false;
@@ -212,8 +214,8 @@ CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function
 bool
 CPL::encrypted () const
 {
-	for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
-		if ((*i)->encrypted ()) {
+	BOOST_FOREACH (shared_ptr<Reel> i, _reels) {
+		if (i->encrypted ()) {
 			return true;
 		}
 	}
@@ -228,16 +230,16 @@ CPL::encrypted () const
 void
 CPL::add (DecryptedKDM const & kdm)
 {
-	for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
-		(*i)->add (kdm);
+	BOOST_FOREACH (shared_ptr<Reel> i, _reels) {
+		i->add (kdm);
 	}
 }
 
 void
 CPL::resolve_refs (list<shared_ptr<Object> > objects)
 {
-	for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
-		(*i)->resolve_refs (objects);
+	BOOST_FOREACH (shared_ptr<Reel> i, _reels) {
+		i->resolve_refs (objects);
 	}
 }
 
@@ -250,7 +252,6 @@ CPL::pkl_type (Standard standard) const
 	case SMPTE:
 		return "text/xml";
 	default:
-		assert (false);
+		DCP_ASSERT (false);
 	}
 }
-