X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel.cc;h=3c3c78925bc1681fa870a669d635dd100731a738;hb=660f1059c3b2c1ee08cd390cf6d5a0b5900a7edc;hp=4bdbcb5fc432633d88b55cb21432c65fe7558fc4;hpb=2e93ca3670e5581b5523f60130b38594de10d6c3;p=libdcp.git

diff --git a/src/reel.cc b/src/reel.cc
index 4bdbcb5f..3c3c7892 100644
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-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
@@ -19,16 +19,18 @@
 
 #include "reel.h"
 #include "util.h"
-#include "picture_mxf.h"
-#include "mono_picture_mxf.h"
-#include "stereo_picture_mxf.h"
-#include "sound_mxf.h"
-#include "subtitle_content.h"
+#include "picture_asset.h"
+#include "mono_picture_asset.h"
+#include "stereo_picture_asset.h"
+#include "sound_asset.h"
+#include "subtitle_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_stereo_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_subtitle_asset.h"
-#include "kdm.h"
+#include "decrypted_kdm_key.h"
+#include "decrypted_kdm.h"
+#include "interop_subtitle_asset.h"
 #include <libxml++/nodes/element.h>
 
 using std::string;
@@ -47,17 +49,17 @@ Reel::Reel (boost::shared_ptr<const cxml::Node> node)
 	if (main_picture) {
 		_main_picture.reset (new ReelMonoPictureAsset (main_picture));
 	}
-	
+
 	shared_ptr<cxml::Node> main_stereoscopic_picture = asset_list->optional_node_child ("MainStereoscopicPicture");
 	if (main_stereoscopic_picture) {
 		_main_picture.reset (new ReelStereoPictureAsset (main_stereoscopic_picture));
 	}
-	
+
 	shared_ptr<cxml::Node> main_sound = asset_list->optional_node_child ("MainSound");
 	if (main_sound) {
 		_main_sound.reset (new ReelSoundAsset (main_sound));
 	}
-	
+
 	shared_ptr<cxml::Node> main_subtitle = asset_list->optional_node_child ("MainSubtitle");
 	if (main_subtitle) {
 		_main_subtitle.reset (new ReelSubtitleAsset (main_subtitle));
@@ -73,7 +75,7 @@ Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const
 	xmlpp::Element* reel = node->add_child ("Reel");
 	reel->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid());
 	xmlpp::Element* asset_list = reel->add_child ("AssetList");
-	
+
 	if (_main_picture && dynamic_pointer_cast<ReelMonoPictureAsset> (_main_picture)) {
 		/* Mono pictures come before other stuff... */
 		_main_picture->write_to_cpl (asset_list, standard);
@@ -92,33 +94,33 @@ Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const
 		_main_picture->write_to_cpl (asset_list, standard);
 	}
 }
-	
+
 bool
-Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
+Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, NoteHandler note) const
 {
 	if ((_main_picture && !other->_main_picture) || (!_main_picture && other->_main_picture)) {
-		note (ERROR, "reel has different assets");
+		note (DCP_ERROR, "Reel: assets differ");
 		return false;
 	}
-	
+
 	if (_main_picture && !_main_picture->equals (other->_main_picture, opt, note)) {
 		return false;
 	}
 
 	if ((_main_sound && !other->_main_sound) || (!_main_sound && other->_main_sound)) {
-		note (ERROR, "reel has different assets");
+		note (DCP_ERROR, "Reel: assets differ");
 		return false;
 	}
-	
+
 	if (_main_sound && !_main_sound->equals (other->_main_sound, opt, note)) {
 		return false;
 	}
 
 	if ((_main_subtitle && !other->_main_subtitle) || (!_main_subtitle && other->_main_subtitle)) {
-		note (ERROR, "reel has different assets");
+		note (DCP_ERROR, "Reel: assets differ");
 		return false;
 	}
-	
+
 	if (_main_subtitle && !_main_subtitle->equals (other->_main_subtitle, opt, note)) {
 		return false;
 	}
@@ -133,31 +135,20 @@ Reel::encrypted () const
 }
 
 void
-Reel::add (KDM const & kdm)
+Reel::add (DecryptedKDM const & kdm)
 {
-	list<KDMKey> keys = kdm.keys ();
-	
-	for (list<KDMKey>::iterator i = keys.begin(); i != keys.end(); ++i) {
-		if (i->key_id() == _main_picture->key_id()) {
-			_main_picture->mxf()->set_key (i->key ());
+	list<DecryptedKDMKey> keys = kdm.keys ();
+
+	for (list<DecryptedKDMKey>::iterator i = keys.begin(); i != keys.end(); ++i) {
+		if (i->id() == _main_picture->key_id()) {
+			_main_picture->asset()->set_key (i->key ());
 		}
-		if (i->key_id() == _main_sound->key_id()) {
-			_main_sound->mxf()->set_key (i->key ());
+		if (i->id() == _main_sound->key_id()) {
+			_main_sound->asset()->set_key (i->key ());
 		}
 	}
 }
 
-void
-Reel::set_mxf_keys (Key key)
-{
-	_main_picture->mxf()->set_key (key);
-	if (_main_sound) {
-		_main_sound->mxf()->set_key (key);
-	}
-
-	/* XXX: subtitle asset? */
-}
-
 void
 Reel::add (shared_ptr<ReelAsset> asset)
 {
@@ -177,14 +168,20 @@ void
 Reel::resolve_refs (list<shared_ptr<Object> > objects)
 {
 	if (_main_picture) {
-		_main_picture->content().resolve (objects);
+		_main_picture->asset_ref().resolve (objects);
 	}
 
 	if (_main_sound) {
-		_main_sound->content().resolve (objects);
+		_main_sound->asset_ref().resolve (objects);
 	}
 
 	if (_main_subtitle) {
-		_main_subtitle->content().resolve (objects);
+		_main_subtitle->asset_ref().resolve (objects);
+
+		/* Interop subtitle handling is all special cases */
+		shared_ptr<InteropSubtitleAsset> iop = dynamic_pointer_cast<InteropSubtitleAsset> (_main_subtitle->asset_ref().object ());
+		if (iop) {
+			iop->resolve_fonts (objects);
+		}
 	}
 }