Various attempts to clean up DCP comparison code.

[libdcp.git] / src / cpl.cc

diff --git a/src/cpl.cc b/src/cpl.cc
index b76e827262354201f69c086a477e8277917ffee2..3599231daad1420b1acb201568667f6237514623 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -42,8 +42,10 @@ using std::ostream;
 using std::list;
 using std::pair;
 using std::make_pair;
+using std::cout;
 using boost::shared_ptr;
 using boost::optional;
+using boost::dynamic_pointer_cast;
 using namespace dcp;
 
 CPL::CPL (string annotation_text, ContentKind content_kind)
@@ -174,27 +176,32 @@ CPL::reel_assets () const
 }
        
 bool
-CPL::equals (CPL const & other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
+CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
 {
-       if (_annotation_text != other._annotation_text && !opt.cpl_annotation_texts_can_differ) {
+       shared_ptr<const CPL> other_cpl = dynamic_pointer_cast<const CPL> (other);
+       if (!other_cpl) {
+               return false;
+       }
+       
+       if (_annotation_text != other_cpl->_annotation_text && !opt.cpl_annotation_texts_can_differ) {
                stringstream s;
-               s << "annotation texts differ: " << _annotation_text << " vs " << other._annotation_text << "\n";
+               s << "CPL: annotation texts differ: " << _annotation_text << " vs " << other_cpl->_annotation_text << "\n";
                note (DCP_ERROR, s.str ());
                return false;
        }
 
-       if (_content_kind != other._content_kind) {
-               note (DCP_ERROR, "content kinds differ");
+       if (_content_kind != other_cpl->_content_kind) {
+               note (DCP_ERROR, "CPL: content kinds differ");
                return false;
        }
 
-       if (_reels.size() != other._reels.size()) {
-               note (DCP_ERROR, String::compose ("reel counts differ (%1 vs %2)", _reels.size(), other._reels.size()));
+       if (_reels.size() != other_cpl->_reels.size()) {
+               note (DCP_ERROR, String::compose ("CPL: reel counts differ (%1 vs %2)", _reels.size(), other_cpl->_reels.size()));
                return false;
        }
        
        list<shared_ptr<Reel> >::const_iterator a = _reels.begin ();
-       list<shared_ptr<Reel> >::const_iterator b = other._reels.begin ();
+       list<shared_ptr<Reel> >::const_iterator b = other_cpl->_reels.begin ();
        
        while (a != _reels.end ()) {
                if (!(*a)->equals (*b, opt, note)) {
@@ -232,18 +239,6 @@ CPL::add (DecryptedKDM const & kdm)
        }
 }
 
-/** Set a private key for every MXF referenced by this CPL.  This will allow the data
- *  to be decrypted or encrypted.
- *  @param key Key to use.
- */
-void
-CPL::set_mxf_keys (Key key)
-{
-       for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
-               (*i)->set_mxf_keys (key);
-       }
-}
-
 void
 CPL::resolve_refs (list<shared_ptr<Object> > objects)
 {