Tweak comments.

[libdcp.git] / src / reel.cc

diff --git a/src/reel.cc b/src/reel.cc
index 4bdbcb5fc432633d88b55cb21432c65fe7558fc4..08a0c93626a23c91a4d712b40d4effebc72949c8 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;
@@ -97,7 +98,7 @@ bool
 Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
 {
        if ((_main_picture && !other->_main_picture) || (!_main_picture && other->_main_picture)) {
-               note (ERROR, "reel has different assets");
+               note (DCP_ERROR, "reel has different assets");
                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 has different assets");
                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 has different assets");
                return false;
        }
        
@@ -133,15 +134,15 @@ Reel::encrypted () const
 }
 
 void
-Reel::add (KDM const & kdm)
+Reel::add (DecryptedKDM const & kdm)
 {
-       list<KDMKey> keys = kdm.keys ();
+       list<DecryptedKDMKey> keys = kdm.keys ();
        
-       for (list<KDMKey>::iterator i = keys.begin(); i != keys.end(); ++i) {
-               if (i->key_id() == _main_picture->key_id()) {
+       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 ());
                }
        }