summaryrefslogtreecommitdiff
path: root/src/smpte_subtitle_asset.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-02-12 00:24:21 +0000
committerCarl Hetherington <cth@carlh.net>2018-02-12 00:24:21 +0000
commita18b9d20ac2a0353a4f1b0b78ce7a8e26fdd6aa8 (patch)
tree0f1d8dc341f3bf87fb4094c1ac771e378719d172 /src/smpte_subtitle_asset.h
parent80df2f4a80686eb2ab412843f5c4146ffc8ff31a (diff)
Use a different ID for the XML inside a SMPTE subtitle MXF than the
ID for the MXF itself. Apparently not doing so is an error (according to Doremi's release notes for 2.8.18).
Diffstat (limited to 'src/smpte_subtitle_asset.h')
-rw-r--r--src/smpte_subtitle_asset.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h
index 004531a2..cf7e714d 100644
--- a/src/smpte_subtitle_asset.h
+++ b/src/smpte_subtitle_asset.h
@@ -151,6 +151,10 @@ public:
return _start_time;
}
+ std::string xml_id () const {
+ return _xml_id;
+ }
+
static bool valid_mxf (boost::filesystem::path);
protected:
@@ -160,6 +164,9 @@ protected:
}
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);
@@ -179,6 +186,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;
};
}