From 89d9ddba959f02b17f1d0e75e2f12c357ce29f2b Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 8 Apr 2021 02:04:06 +0200
Subject: Comment tweaks.

---
 src/mxf.h                  | 9 +++++++--
 src/smpte_subtitle_asset.h | 7 +++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/mxf.h b/src/mxf.h
index 82c86e8e..19d4a956 100644
--- a/src/mxf.h
+++ b/src/mxf.h
@@ -140,9 +140,14 @@ protected:
 
 	MXF ();
 
+	/** Read an ASDCP::WriterInfo struct, extracting things for our
+	 *  member variables.
+	 *  @return AssetUUID of the MXF
+	 */
 	std::string read_writer_info (ASDCP::WriterInfo const &);
-	/** Fill in a ADSCP::WriteInfo struct.
-	 *  @param w struct to fill in.
+
+	/** Fill in a ASDCP::WriteInfo struct.
+	 *  @param w struct to fill in
 	 */
 	void fill_writer_info (ASDCP::WriterInfo* w, std::string id) const;
 
diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h
index 1521bf35..5d4553a5 100644
--- a/src/smpte_subtitle_asset.h
+++ b/src/smpte_subtitle_asset.h
@@ -211,10 +211,13 @@ private:
 	boost::optional<Time> _start_time;
 
 	std::vector<std::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.
+	/** 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.
 	 */
 	std::string _xml_id;
+
+	/** ResourceID read from the MXF, if there was one */
+	boost::optional<std::string> _resource_id;
 };
 
 
-- 
cgit v1.2.3