X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsmpte_subtitle_asset.h;h=79a0024bc74b115d102db1dbab42966cd0d56d1c;hb=201b6fdf572c04424d870ac4d07d1d1a8725b24c;hp=1a609c611386c035b2a3b4de5b08f306f0d77911;hpb=d1f0b2b71a702b5624485cfeacaee5d58c4af5b2;p=libdcp.git

diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h
index 1a609c61..79a0024b 100644
--- a/src/smpte_subtitle_asset.h
+++ b/src/smpte_subtitle_asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     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;
@@ -135,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;
@@ -160,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;
 };
 
 }