Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / cpl.h

diff --git a/src/cpl.h b/src/cpl.h
index 4219c523268d6326fc6d0aceba6bcb7ed5fbe685..bcc1f06bd9ebb81bc4acc420ca7b2bac9c6c345f 100644 (file)
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -78,7 +78,11 @@ public:
 
        /** @return contents of the <AnnotationText> node */
        std::string annotation_text () const {
-               return _annotation_text;
+               return _metadata.annotation_text;
+       }
+
+       void set_annotation_text (std::string at) {
+               _metadata.annotation_text = at;
        }
 
        /** @return contents of the <ContentTitleText> node */
@@ -86,6 +90,10 @@ public:
                return _content_title_text;
        }
 
+       void set_content_title_text (std::string ct) {
+               _content_title_text = ct;
+       }
+
        /** @return contents of the <Id> node within <ContentVersion> */
        void set_content_version_id (std::string id) {
                _content_version_id = id;
@@ -132,14 +140,15 @@ public:
                return _standard;
        }
 
+       static std::string static_pkl_type (Standard standard);
+
 protected:
        /** @return type string for PKLs for this asset */
        std::string pkl_type (Standard standard) const;
 
 private:
-       std::string _annotation_text;               ///< &lt;AnnotationText&gt;
-       /** &lt;Issuer&gt;, &lt;Creator&gt; and &lt;IssueDate&gt;.  These are grouped
-        *  because they occur together in a few places.
+       /** &lt;Issuer&gt;, &lt;Creator&gt;, &lt;IssueDate&gt; and &lt;AnnotationText&gt.
+        *  These are grouped because they occur together in a few places.
         */
        XMLMetadata _metadata;
        std::string _content_title_text;            ///< &lt;ContentTitleText&gt;