Support some different headers in private_key_fingerprint()

[libdcp.git] / src / smpte_subtitle_asset.h

diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h
index 1ece2405c10952028648a4841c79d99915e1ea02..b707da124ba980f605345266cc3ec2939f9c744a 100644 (file)
--- a/src/smpte_subtitle_asset.h
+++ b/src/smpte_subtitle_asset.h
@@ -58,6 +58,8 @@ namespace ASDCP {
 
 struct verify_invalid_language1;
 struct verify_invalid_language2;
+struct write_subtitles_in_vertical_order_with_top_alignment;
+struct write_subtitles_in_vertical_order_with_bottom_alignment;
 
 
 namespace dcp {
@@ -176,11 +178,14 @@ public:
                return _start_time;
        }
 
-       std::string xml_id () const {
+       /** @return ID from XML's <Id> tag, or the <Id> that will be used when writing the XML,
+        *  or boost::none if this content is encrypted and no key is available.
+        */
+       boost::optional<std::string> xml_id () const {
                return _xml_id;
        }
 
-       /** @return ResourceID read from the MXF, if there was one */
+       /** @return ResourceID read from any MXF that was read */
        boost::optional<std::string> resource_id () const {
                return _resource_id;
        }
@@ -201,10 +206,13 @@ private:
        friend struct ::write_smpte_subtitle_test2;
        friend struct ::verify_invalid_language1;
        friend struct ::verify_invalid_language2;
+       friend struct ::write_subtitles_in_vertical_order_with_top_alignment;
+       friend struct ::write_subtitles_in_vertical_order_with_bottom_alignment;
 
        void read_fonts (std::shared_ptr<ASDCP::TimedText::MXFReader>);
        void parse_xml (std::shared_ptr<cxml::Document> xml);
-       void read_mxf_descriptor (std::shared_ptr<ASDCP::TimedText::MXFReader> reader, std::shared_ptr<DecryptionContext> dec);
+       void read_mxf_descriptor (std::shared_ptr<ASDCP::TimedText::MXFReader> reader);
+       void read_mxf_resources (std::shared_ptr<ASDCP::TimedText::MXFReader> reader, std::shared_ptr<DecryptionContext> dec);
 
        /** The total length of this content in video frames.  The amount of
         *  content presented may be less than this.
@@ -226,8 +234,9 @@ private:
        std::vector<std::shared_ptr<SMPTELoadFontNode>> _load_font_nodes;
        /** UUID for the XML inside the MXF, which should be the same as the ResourceID in the MXF (our _resource_id)
         *  but different to the AssetUUID in the MXF (our _id) according to SMPTE Bv2.1 and Doremi's 2.8.18 release notes.
+        *  May be boost::none if this object has been made from an encrypted object without a key.
         */
-       std::string _xml_id;
+       boost::optional<std::string> _xml_id;
 
        /** ResourceID read from the MXF, if there was one */
        boost::optional<std::string> _resource_id;