Add AspectAdjust to subtitles.

[libdcp.git] / src / reel.cc

diff --git a/src/reel.cc b/src/reel.cc
index 4bdbcb5fc432633d88b55cb21432c65fe7558fc4..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;
@@ -94,10 +95,10 @@ Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const
 }
        
 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 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)
 {