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 7716464d960fc2e6b045cad0df57284c9b963fd1..bcc1f06bd9ebb81bc4acc420ca7b2bac9c6c345f 100644 (file)
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you -can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/cpl.h
@@ -29,7 +43,6 @@
 #include "key.h"
 #include "asset.h"
 #include "metadata.h"
-#include <libxml++/libxml++.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/optional.hpp>
@@ -42,7 +55,7 @@ class ReelAsset;
 class Reel;
 class XMLMetadata;
 class MXFMetadata;
-class Signer;
+class CertificateChain;
 class DecryptedKDM;
 
 /** @class CPL
@@ -52,7 +65,7 @@ class CPL : public Asset
 {
 public:
        CPL (std::string annotation_text, ContentKind content_kind);
-       CPL (boost::filesystem::path file);
+       explicit CPL (boost::filesystem::path file);
 
        bool equals (
                boost::shared_ptr<const Asset> other,
@@ -65,7 +78,11 @@ public:
 
        /** @return contents of the &lt;AnnotationText&gt; 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 &lt;ContentTitleText&gt; node */
@@ -73,6 +90,10 @@ public:
                return _content_title_text;
        }
 
+       void set_content_title_text (std::string ct) {
+               _content_title_text = ct;
+       }
+
        /** @return contents of the &lt;Id&gt; node within &lt;ContentVersion&gt; */
        void set_content_version_id (std::string id) {
                _content_version_id = id;
@@ -108,19 +129,26 @@ public:
        void write_xml (
                boost::filesystem::path file,
                Standard standard,
-               boost::shared_ptr<const Signer>
+               boost::shared_ptr<const CertificateChain>
                ) const;
 
-       void resolve_refs (std::list<boost::shared_ptr<Object> >);
+       void resolve_refs (std::list<boost::shared_ptr<Asset> >);
+
+       int64_t duration () const;
+
+       boost::optional<Standard> standard () const {
+               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;
@@ -128,6 +156,9 @@ private:
        std::string _content_version_id;            ///< &lt;Id&gt; in &lt;ContentVersion&gt;
        std::string _content_version_label_text;    ///< &lt;LabelText&gt; in &lt;ContentVersion&gt;
        std::list<boost::shared_ptr<Reel> > _reels;
+
+       /** Standard of CPL that was read in */
+       boost::optional<Standard> _standard;
 };
 
 }