Various attempts to clean up DCP comparison code.

[libdcp.git] / src / cpl.cc

diff --git a/src/cpl.cc b/src/cpl.cc
index 9eae09ad51d456168af3d37f18f2a8f3b9b4a4ae..3599231daad1420b1acb201568667f6237514623 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -17,6 +17,7 @@
 
 */
 
+#include "raw_convert.h"
 #include "cpl.h"
 #include "util.h"
 #include "mono_picture_mxf.h"
@@ -32,6 +33,7 @@
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_subtitle_asset.h"
+#include "local_time.h"
 #include <libxml/parser.h>
 
 using std::string;
@@ -40,9 +42,10 @@ using std::ostream;
 using std::list;
 using std::pair;
 using std::make_pair;
+using std::cout;
 using boost::shared_ptr;
-using boost::lexical_cast;
 using boost::optional;
+using boost::dynamic_pointer_cast;
 using namespace dcp;
 
 CPL::CPL (string annotation_text, ContentKind content_kind)
@@ -55,9 +58,7 @@ CPL::CPL (string annotation_text, ContentKind content_kind)
        /* default _content_version_id to and _content_version_label to
           a random ID and the current time.
        */
-       time_t now = time (0);
-       struct tm* tm = localtime (&now);
-       _content_version_id = "urn:uuid:" + make_uuid() + tm_to_string (tm);
+       _content_version_id = "urn:uuid:" + make_uuid() + LocalTime().as_string ();
        _content_version_label_text = _content_version_id;
 }
 
@@ -154,20 +155,20 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<cons
        set_file (file);
 }
 
-list<shared_ptr<const Content> >
-CPL::content () const
+list<shared_ptr<const ReelAsset> >
+CPL::reel_assets () const
 {
-       list<shared_ptr<const Content> > c;
+       list<shared_ptr<const ReelAsset> > c;
 
        for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
                if ((*i)->main_picture ()) {
-                       c.push_back ((*i)->main_picture()->mxf ());
+                       c.push_back ((*i)->main_picture());
                }
                if ((*i)->main_sound ()) {
-                       c.push_back ((*i)->main_sound()->mxf ());
+                       c.push_back ((*i)->main_sound());
                }
                if ((*i)->main_subtitle ()) {
-                       c.push_back ((*i)->main_subtitle()->subtitle_content ());
+                       c.push_back ((*i)->main_subtitle());
                }
        }
 
@@ -175,27 +176,32 @@ CPL::content () 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";
-               note (ERROR, s.str ());
+               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 (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 (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)) {
@@ -226,25 +232,13 @@ CPL::encrypted () const
  *  @param kdm KDM.
  */
 void
-CPL::add (KDM const & kdm)
+CPL::add (DecryptedKDM const & kdm)
 {
        for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
                (*i)->add (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)
 {