Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / smpte_subtitle_asset.h

diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h
index a7adee6faa29919856e74a410c366332864e46fc..79a0024bc74b115d102db1dbab42966cd0d56d1c 100644 (file)
--- a/src/smpte_subtitle_asset.h
+++ b/src/smpte_subtitle_asset.h
@@ -1,20 +1,34 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 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/smpte_subtitle_asset.h
@@ -24,6 +38,7 @@
 #include "subtitle_asset.h"
 #include "local_time.h"
 #include "mxf.h"
+#include "crypto_context.h"
 #include <boost/filesystem.hpp>
 
 namespace ASDCP {
@@ -46,7 +61,7 @@ public:
 
        /** @param file File name
         */
-       SMPTESubtitleAsset (boost::filesystem::path file);
+       explicit SMPTESubtitleAsset (boost::filesystem::path file);
 
        bool equals (
                boost::shared_ptr<const Asset>,
@@ -58,8 +73,9 @@ public:
 
        std::string xml_as_string () const;
        void write (boost::filesystem::path path) const;
-       void add (SubtitleString);
+       void add (boost::shared_ptr<Subtitle>);
        void add_font (std::string id, boost::filesystem::path file);
+       void set_key (Key key);
 
        void set_content_title_text (std::string t) {
                _content_title_text = t;
@@ -69,6 +85,10 @@ public:
                _language = l;
        }
 
+       void set_issue_date (LocalTime t) {
+               _issue_date = t;
+       }
+
        void set_reel_number (int r) {
                _reel_number = r;
        }
@@ -131,21 +151,34 @@ public:
                return _start_time;
        }
 
+       std::string xml_id () const {
+               return _xml_id;
+       }
+
        static bool valid_mxf (boost::filesystem::path);
+       static std::string static_pkl_type (Standard) {
+               return "application/mxf";
+       }
 
 protected:
 
-       std::string pkl_type (Standard) const {
-               return "application/mxf";
+       std::string pkl_type (Standard s) const {
+               return static_pkl_type (s);
        }
 
 private:
+       friend struct ::write_smpte_subtitle_test;
+       friend struct ::write_smpte_subtitle_test2;
+
        void read_fonts (boost::shared_ptr<ASDCP::TimedText::MXFReader>);
+       void parse_xml (boost::shared_ptr<cxml::Document> xml);
+       void read_mxf_descriptor (boost::shared_ptr<ASDCP::TimedText::MXFReader> reader, boost::shared_ptr<DecryptionContext> dec);
 
        /** The total length of this content in video frames.  The amount of
         *  content presented may be less than this.
         */
        int64_t _intrinsic_duration;
+       /** <ContentTitleText> from the asset */
        std::string _content_title_text;
        boost::optional<std::string> _language;
        boost::optional<std::string> _annotation_text;
@@ -156,6 +189,10 @@ private:
        boost::optional<Time> _start_time;
 
        std::list<boost::shared_ptr<SMPTELoadFontNode> > _load_font_nodes;
+       /** UUID for the XML inside the MXF, which should be different to the ID of the MXF according to
+        *  Doremi's 2.8.18 release notes.
+        */
+       std::string _xml_id;
 };
 
 }