X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fcpl.cc;h=b11452d935a9468736b3b86cbfc119c312f605a8;hb=ed3326d5ac0f05762f820a341332718ebea220f5;hp=535fd77f65d7ba2611d8a0915b5ec6631d94cde7;hpb=7bca4c05ca38b218c252b0fe98a866806d9a2ded;p=libdcp.git

diff --git a/src/cpl.cc b/src/cpl.cc
index 535fd77f..b11452d9 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -17,24 +17,20 @@
 
 */
 
-#include "raw_convert.h"
 #include "cpl.h"
 #include "util.h"
-#include "mono_picture_mxf.h"
-#include "stereo_picture_mxf.h"
-#include "sound_mxf.h"
-#include "subtitle_content.h"
 #include "reel.h"
 #include "metadata.h"
 #include "signer.h"
-#include "exceptions.h"
 #include "xml.h"
-#include "compose.hpp"
 #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;
@@ -42,8 +38,10 @@ using std::ostream;
 using std::list;
 using std::pair;
 using std::make_pair;
+using std::cout;
 using boost::shared_ptr;
 using boost::optional;
+using boost::dynamic_pointer_cast;
 using namespace dcp;
 
 CPL::CPL (string annotation_text, ContentKind content_kind)
@@ -138,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) {
@@ -153,20 +151,20 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<cons
 	set_file (file);
 }
 
-list<shared_ptr<const Content> >
-CPL::content () const
+list<shared_ptr<const ReelAsset> >
+CPL::reel_assets () const
 {
-	list<shared_ptr<const Content> > c;
+	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()->mxf ());
+	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()->mxf ());
+		if (i->main_sound ()) {
+			c.push_back (i->main_sound());
 		}
-		if ((*i)->main_subtitle ()) {
-			c.push_back ((*i)->main_subtitle()->subtitle_content ());
+		if (i->main_subtitle ()) {
+			c.push_back (i->main_subtitle());
 		}
 	}
 
@@ -174,27 +172,32 @@ CPL::content () const
 }
 	
 bool
-CPL::equals (CPL const & other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
+CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
 {
-	if (_annotation_text != other._annotation_text && !opt.cpl_annotation_texts_can_differ) {
+	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 << "annotation texts differ: " << _annotation_text << " vs " << other._annotation_text << "\n";
+		s << "CPL: annotation texts differ: " << _annotation_text << " vs " << other_cpl->_annotation_text << "\n";
 		note (DCP_ERROR, s.str ());
 		return false;
 	}
 
-	if (_content_kind != other._content_kind) {
-		note (DCP_ERROR, "content kinds differ");
+	if (_content_kind != other_cpl->_content_kind) {
+		note (DCP_ERROR, "CPL: content kinds differ");
 		return false;
 	}
 
-	if (_reels.size() != other._reels.size()) {
-		note (DCP_ERROR, String::compose ("reel counts differ (%1 vs %2)", _reels.size(), other._reels.size()));
+	if (_reels.size() != other_cpl->_reels.size()) {
+		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._reels.begin ();
+	list<shared_ptr<Reel> >::const_iterator b = other_cpl->_reels.begin ();
 	
 	while (a != _reels.end ()) {
 		if (!(*a)->equals (*b, opt, note)) {
@@ -211,8 +214,8 @@ CPL::equals (CPL const & other, EqualityOptions opt, boost::function<void (NoteT
 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;
 		}
 	}
@@ -227,28 +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);
-	}
-}
-
-/** Set a private key for every MXF referenced by this CPL.  This will allow the data
- *  to be decrypted or encrypted.
- *  @param key Key to use.
- */
-void
-CPL::set_mxf_keys (Key key)
-{
-	for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
-		(*i)->set_mxf_keys (key);
+	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);
 	}
 }
 
@@ -261,7 +252,7 @@ CPL::pkl_type (Standard standard) const
 	case SMPTE:
 		return "text/xml";
 	default:
-		assert (false);
+		DCP_ASSERT (false);
 	}
 }