Missing finalize() in dcpdecryptmxf.

[libdcp.git] / src / smpte_subtitle_asset.h

diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h
index 6984b644749e6b77185130a0c2445b5b1cf29ac9..4e220d4d586003a06da83ab79ec60fc3afc1d409 100644 (file)
--- a/src/smpte_subtitle_asset.h
+++ b/src/smpte_subtitle_asset.h
@@ -83,18 +83,18 @@ public:
                std::shared_ptr<const Asset>,
                EqualityOptions,
                NoteHandler note
-               ) const;
+               ) const override;
 
-       std::vector<std::shared_ptr<LoadFontNode>> load_font_nodes () const;
+       std::vector<std::shared_ptr<LoadFontNode>> load_font_nodes () const override;
 
-       std::string xml_as_string () const;
+       std::string xml_as_string () const override;
 
        /** Write this content to a MXF file */
-       void write (boost::filesystem::path path) const;
+       void write (boost::filesystem::path path) const override;
 
-       void add (std::shared_ptr<Subtitle>);
-       void add_font (std::string id, dcp::ArrayData data);
-       void set_key (Key key);
+       void add (std::shared_ptr<Subtitle>) override;
+       void add_font (std::string id, dcp::ArrayData data) override;
+       void set_key (Key key) override;
 
        void set_content_title_text (std::string t) {
                _content_title_text = t;
@@ -168,7 +168,7 @@ public:
         *  e.g. a time_code_rate of 250 means that a subtitle time of 0:0:0:001
         *  represents 4ms.
         */
-       int time_code_rate () const {
+       int time_code_rate () const override {
                return _time_code_rate;
        }
 
@@ -176,11 +176,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;
        }
@@ -192,7 +195,7 @@ public:
 
 protected:
 
-       std::string pkl_type (Standard s) const {
+       std::string pkl_type (Standard s) const override {
                return static_pkl_type (s);
        }
 
@@ -204,7 +207,8 @@ private:
 
        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 +230,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;