Tweak comments.

[libdcp.git] / src / cpl.cc

diff --git a/src/cpl.cc b/src/cpl.cc
index cd255309dcb65fbdab8b3bd6d49d9dd2f518be97..535fd77f65d7ba2611d8a0915b5ec6631d94cde7 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;
@@ -41,7 +43,6 @@ using std::list;
 using std::pair;
 using std::make_pair;
 using boost::shared_ptr;
-using boost::lexical_cast;
 using boost::optional;
 using namespace dcp;
 
@@ -55,9 +56,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;
 }
 
@@ -158,6 +157,7 @@ list<shared_ptr<const Content> >
 CPL::content () const
 {
        list<shared_ptr<const Content> > 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 ());
@@ -179,17 +179,17 @@ CPL::equals (CPL const & other, EqualityOptions opt, boost::function<void (NoteT
        if (_annotation_text != other._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 ());
+               note (DCP_ERROR, s.str ());
                return false;
        }
 
        if (_content_kind != other._content_kind) {
-               note (ERROR, "content kinds differ");
+               note (DCP_ERROR, "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()));
+               note (DCP_ERROR, String::compose ("reel counts differ (%1 vs %2)", _reels.size(), other._reels.size()));
                return false;
        }
        
@@ -225,7 +225,7 @@ 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);
@@ -251,3 +251,17 @@ CPL::resolve_refs (list<shared_ptr<Object> > objects)
                (*i)->resolve_refs (objects);
        }
 }
+
+string
+CPL::pkl_type (Standard standard) const
+{
+       switch (standard) {
+       case INTEROP:
+               return "text/xml;asdcpKind=CPL";
+       case SMPTE:
+               return "text/xml";
+       default:
+               assert (false);
+       }
+}
+