X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel.cc;h=9e6e0ca73a20320615808dd649be059148f17763;hb=b47a54b85aee24795008463681cb31f4307ffe84;hp=d039f95b2b93974d9ceded487ac2bc7c82a90a54;hpb=a5901718e3a0ee692d745fd3a6d8f5a49d422a26;p=libdcp.git

diff --git a/src/reel.cc b/src/reel.cc
index d039f95b..9e6e0ca7 100644
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014 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
@@ -17,45 +17,88 @@
 
 */
 
-#include <libxml++/nodes/element.h>
 #include "reel.h"
 #include "util.h"
-#include "picture_asset.h"
-#include "sound_asset.h"
-#include "subtitle_asset.h"
-#include "kdm.h"
+#include "picture_mxf.h"
+#include "mono_picture_mxf.h"
+#include "stereo_picture_mxf.h"
+#include "sound_mxf.h"
+#include "subtitle_content.h"
+#include "reel_mono_picture_asset.h"
+#include "reel_stereo_picture_asset.h"
+#include "reel_sound_asset.h"
+#include "reel_subtitle_asset.h"
+#include "decrypted_kdm_key.h"
+#include "decrypted_kdm.h"
+#include <libxml++/nodes/element.h>
 
 using std::string;
 using std::list;
 using std::cout;
 using boost::shared_ptr;
-using namespace libdcp;
+using boost::dynamic_pointer_cast;
+using namespace dcp;
+
+Reel::Reel (boost::shared_ptr<const cxml::Node> node)
+	: Object (node->string_child ("Id"))
+{
+	shared_ptr<cxml::Node> asset_list = node->node_child ("AssetList");
+
+	shared_ptr<cxml::Node> main_picture = asset_list->optional_node_child ("MainPicture");
+	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));
+	}
+
+	node->ignore_child ("AnnotationText");
+	node->done ();
+}
 
 void
-Reel::write_to_cpl (xmlpp::Node* node, bool interop) const
+Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const
 {
-	xmlpp::Node* reel = node->add_child ("Reel");
+	xmlpp::Element* reel = node->add_child ("Reel");
 	reel->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid());
-	xmlpp::Node* asset_list = reel->add_child ("AssetList");
+	xmlpp::Element* asset_list = reel->add_child ("AssetList");
 	
-	if (_main_picture) {
-		_main_picture->write_to_cpl (asset_list, interop);
+	if (_main_picture && dynamic_pointer_cast<ReelMonoPictureAsset> (_main_picture)) {
+		/* Mono pictures come before other stuff... */
+		_main_picture->write_to_cpl (asset_list, standard);
 	}
 
 	if (_main_sound) {
-		_main_sound->write_to_cpl (asset_list);
+		_main_sound->write_to_cpl (asset_list, standard);
 	}
 
 	if (_main_subtitle) {
-		_main_subtitle->write_to_cpl (asset_list);
+		_main_subtitle->write_to_cpl (asset_list, standard);
+	}
+
+	if (_main_picture && dynamic_pointer_cast<ReelStereoPictureAsset> (_main_picture)) {
+		/* ... but stereo pictures must come after */
+		_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;
 	}
 	
@@ -64,7 +107,7 @@ Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::f
 	}
 
 	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;
 	}
 	
@@ -73,7 +116,7 @@ Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::f
 	}
 
 	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;
 	}
 	
@@ -91,16 +134,47 @@ Reel::encrypted () const
 }
 
 void
-Reel::add_kdm (KDM const & kdm)
+Reel::add (DecryptedKDM const & kdm)
 {
-	list<KDMCipher> ciphers = kdm.ciphers ();
-	
-	for (list<KDMCipher>::iterator i = ciphers.begin(); i != ciphers.end(); ++i) {
-		if (i->key_id() == _main_picture->key_id()) {
-			_main_picture->set_kdm_cipher (*i);
+	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->mxf()->set_key (i->key ());
 		}
-		if (i->key_id() == _main_sound->key_id()) {
-			_main_sound->set_kdm_cipher (*i);
+		if (i->id() == _main_sound->key_id()) {
+			_main_sound->mxf()->set_key (i->key ());
 		}
 	}
 }
+
+void
+Reel::add (shared_ptr<ReelAsset> asset)
+{
+	shared_ptr<ReelPictureAsset> p = dynamic_pointer_cast<ReelPictureAsset> (asset);
+	shared_ptr<ReelSoundAsset> so = dynamic_pointer_cast<ReelSoundAsset> (asset);
+	shared_ptr<ReelSubtitleAsset> su = dynamic_pointer_cast<ReelSubtitleAsset> (asset);
+	if (p) {
+		_main_picture = p;
+	} else if (so) {
+		_main_sound = so;
+	} else if (su) {
+		_main_subtitle = su;
+	}
+}
+
+void
+Reel::resolve_refs (list<shared_ptr<Object> > objects)
+{
+	if (_main_picture) {
+		_main_picture->content().resolve (objects);
+	}
+
+	if (_main_sound) {
+		_main_sound->content().resolve (objects);
+	}
+
+	if (_main_subtitle) {
+		_main_subtitle->content().resolve (objects);
+	}
+}