Use a typedef for a note-taking functor.

[libdcp.git] / src / reel.cc

diff --git a/src/reel.cc b/src/reel.cc
index 8326c197d5f8bde676c54d34dadc3443276e43b7..9e6e0ca73a20320615808dd649be059148f17763 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -28,7 +28,8 @@
 #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 <libxml++/nodes/element.h>
 
 using std::string;
@@ -38,7 +39,7 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using namespace dcp;
 
-Reel::Reel (shared_ptr<const cxml::Node> node)
+Reel::Reel (boost::shared_ptr<const cxml::Node> node)
        : Object (node->string_child ("Id"))
 {
        shared_ptr<cxml::Node> asset_list = node->node_child ("AssetList");
@@ -74,7 +75,7 @@ Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const
        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<MonoPictureMXF> (_main_picture)) {
+       if (_main_picture && dynamic_pointer_cast<ReelMonoPictureAsset> (_main_picture)) {
                /* Mono pictures come before other stuff... */
                _main_picture->write_to_cpl (asset_list, standard);
        }
@@ -87,17 +88,17 @@ Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const
                _main_subtitle->write_to_cpl (asset_list, standard);
        }
 
-       if (_main_picture && dynamic_pointer_cast<StereoPictureMXF> (_main_picture)) {
+       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;
        }
        
@@ -106,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;
        }
        
@@ -115,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;
        }
        
@@ -133,31 +134,20 @@ Reel::encrypted () const
 }
 
 void
-Reel::add_kdm (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()) {
+       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()) {
+               if (i->id() == _main_sound->key_id()) {
                        _main_sound->mxf()->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)
 {
@@ -172,3 +162,19 @@ Reel::add (shared_ptr<ReelAsset> asset)
                _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);
+       }
+}