Add ContentVersion class.

[libdcp.git] / src / cpl.cc

diff --git a/src/cpl.cc b/src/cpl.cc
index 726d69b722ef6f35f5f92d0491d3349a81450a08..ac442333f2f44ac673accdfdefe931a866167f02 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -64,16 +64,19 @@ static string const cpl_smpte_ns   = "http://www.smpte-ra.org/schemas/429-7/2006
 
 CPL::CPL (string annotation_text, ContentKind content_kind)
        /* default _content_title_text to annotation_text */
-       : _content_title_text (annotation_text)
+       : _issuer ("libdcp" LIBDCP_VERSION)
+       , _creator ("libdcp" LIBDCP_VERSION)
+       , _issue_date (LocalTime().as_string())
+       , _annotation_text (annotation_text)
+       , _content_title_text (annotation_text)
        , _content_kind (content_kind)
 {
-       _metadata.annotation_text = annotation_text;
        /* default _content_version_id to a random ID and _content_version_label to
           a random ID and the current time.
        */
        string const uuid = make_uuid();
-       _content_version_id = "urn:uuid:" + uuid;
-       _content_version_label_text = uuid + LocalTime().as_string ();
+       _content_version.id = "urn:uuid:" + uuid;
+       _content_version.label_text = uuid + LocalTime().as_string ();
 }
 
 /** Construct a CPL object from a XML file */
@@ -93,19 +96,27 @@ CPL::CPL (boost::filesystem::path file)
        }
 
        _id = remove_urn_uuid (f.string_child ("Id"));
-       _metadata.annotation_text = f.optional_string_child ("AnnotationText").get_value_or ("");
-       _metadata.issuer = f.optional_string_child ("Issuer").get_value_or ("");
-       _metadata.creator = f.optional_string_child ("Creator").get_value_or ("");
-       _metadata.issue_date = f.string_child ("IssueDate");
+       _annotation_text = f.optional_string_child("AnnotationText").get_value_or("");
+       _issuer = f.optional_string_child("Issuer").get_value_or("");
+       _creator = f.optional_string_child("Creator").get_value_or("");
+       _issue_date = f.string_child ("IssueDate");
        _content_title_text = f.string_child ("ContentTitleText");
        _content_kind = content_kind_from_string (f.string_child ("ContentKind"));
        shared_ptr<cxml::Node> content_version = f.optional_node_child ("ContentVersion");
        if (content_version) {
-               _content_version_id = content_version->optional_string_child ("Id").get_value_or ("");
-               _content_version_label_text = content_version->string_child ("LabelText");
+               _content_version.id = content_version->optional_string_child("Id").get_value_or("");
+               _content_version.label_text = content_version->string_child("LabelText");
                content_version->done ();
+       } else if (_standard == SMPTE) {
+               /* ContentVersion is required in SMPTE */
+               throw XMLError ("Missing ContentVersion tag in CPL");
+       }
+       cxml::ConstNodePtr rating_list = f.node_child ("RatingList");
+       if (rating_list) {
+               BOOST_FOREACH (cxml::ConstNodePtr i, rating_list->node_children("Rating")) {
+                       _ratings.push_back (Rating(i));
+               }
        }
-       f.ignore_child ("RatingList");
        _reels = type_grand_children<Reel> (f, "ReelList", "Reel");
 
        f.ignore_child ("Issuer");
@@ -141,18 +152,18 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<cons
        }
 
        root->add_child("Id")->add_child_text ("urn:uuid:" + _id);
-       root->add_child("AnnotationText")->add_child_text (_metadata.annotation_text);
-       root->add_child("IssueDate")->add_child_text (_metadata.issue_date);
-       root->add_child("Issuer")->add_child_text (_metadata.issuer);
-       root->add_child("Creator")->add_child_text (_metadata.creator);
+       root->add_child("AnnotationText")->add_child_text (_annotation_text);
+       root->add_child("IssueDate")->add_child_text (_issue_date);
+       root->add_child("Issuer")->add_child_text (_issuer);
+       root->add_child("Creator")->add_child_text (_creator);
        root->add_child("ContentTitleText")->add_child_text (_content_title_text);
        root->add_child("ContentKind")->add_child_text (content_kind_to_string (_content_kind));
-       {
-               xmlpp::Node* cv = root->add_child ("ContentVersion");
-               cv->add_child ("Id")->add_child_text (_content_version_id);
-               cv->add_child ("LabelText")->add_child_text (_content_version_label_text);
+       _content_version.as_xml (root);
+
+       xmlpp::Element* rating_list = root->add_child("RatingList");
+       BOOST_FOREACH (Rating i, _ratings) {
+               i.as_xml (rating_list->add_child("Rating"));
        }
-       root->add_child("RatingList");
 
        xmlpp::Element* reel_list = root->add_child ("ReelList");
 
@@ -160,20 +171,21 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<cons
                i->write_to_cpl (reel_list, standard);
        }
 
+       indent (root, 0);
+
        if (signer) {
                signer->sign (root, standard);
        }
 
-       /* This must not be the _formatted version otherwise signature digests will be wrong */
-       doc.write_to_file (file.string (), "UTF-8");
+       doc.write_to_file_formatted (file.string(), "UTF-8");
 
        set_file (file);
 }
 
-list<shared_ptr<ReelAsset> >
-CPL::reel_assets ()
+list<shared_ptr<ReelMXF> >
+CPL::reel_mxfs ()
 {
-       list<shared_ptr<ReelAsset> > c;
+       list<shared_ptr<ReelMXF> > c;
 
        BOOST_FOREACH (shared_ptr<Reel> i, _reels) {
                if (i->main_picture ()) {
@@ -196,10 +208,10 @@ CPL::reel_assets ()
        return c;
 }
 
-list<shared_ptr<const ReelAsset> >
-CPL::reel_assets () const
+list<shared_ptr<const ReelMXF> >
+CPL::reel_mxfs () const
 {
-       list<shared_ptr<const ReelAsset> > c;
+       list<shared_ptr<const ReelMXF> > c;
 
        BOOST_FOREACH (shared_ptr<Reel> i, _reels) {
                if (i->main_picture ()) {
@@ -230,8 +242,8 @@ CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler not
                return false;
        }
 
-       if (_metadata.annotation_text != other_cpl->_metadata.annotation_text && !opt.cpl_annotation_texts_can_differ) {
-               string const s = "CPL: annotation texts differ: " + _metadata.annotation_text + " vs " + other_cpl->_metadata.annotation_text + "\n";
+       if (_annotation_text != other_cpl->_annotation_text && !opt.cpl_annotation_texts_can_differ) {
+               string const s = "CPL: annotation texts differ: " + _annotation_text + " vs " + other_cpl->_annotation_text + "\n";
                note (DCP_ERROR, s);
                return false;
        }