Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0

[libdcp.git] / src / reel.cc

diff --git a/src/reel.cc b/src/reel.cc
index 34b520b49365b08db4047ff46dc686f167f5545f..9e6e0ca73a20320615808dd649be059148f17763 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -95,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;
        }
        
@@ -107,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;
        }
        
@@ -116,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;
        }
        
@@ -137,7 +137,7 @@ void
 Reel::add (DecryptedKDM const & kdm)
 {
        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 ());
@@ -148,17 +148,6 @@ Reel::add (DecryptedKDM const & kdm)
        }
 }
 
-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)
 {