summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-07-30 00:14:01 +0100
committerCarl Hetherington <cth@carlh.net>2016-07-30 00:14:01 +0100
commit1713b44ac4727f4de6a899b27e49f104324ccfa6 (patch)
tree98aaebb91a351c2192abc2e5af5ced30eeebe1a4 /src
parentf3fb557c4fdaed2e642e8c30a0363af5042beaa5 (diff)
Comments.
Diffstat (limited to 'src')
-rw-r--r--src/asset.cc4
-rw-r--r--src/asset.h1
-rw-r--r--src/dcp_time.h2
-rw-r--r--src/smpte_subtitle_asset.h1
4 files changed, 7 insertions, 1 deletions
diff --git a/src/asset.cc b/src/asset.cc
index 32f4e079..1a3bd363 100644
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -64,6 +64,10 @@ Asset::Asset (boost::filesystem::path file)
}
+/** Create an Asset from a given file with a known ID.
+ * @param file File name.
+ * @param id ID.
+ */
Asset::Asset (string id, boost::filesystem::path file)
: Object (id)
, _file (file)
diff --git a/src/asset.h b/src/asset.h
index 1871b7ee..214cc227 100644
--- a/src/asset.h
+++ b/src/asset.h
@@ -103,6 +103,7 @@ protected:
private:
friend struct ::asset_test;
+ /** @return type string for PKLs for this asset */
virtual std::string pkl_type (Standard standard) const = 0;
/** Hash of _file if it has been computed */
diff --git a/src/dcp_time.h b/src/dcp_time.h
index 2a9f13d8..1fae786c 100644
--- a/src/dcp_time.h
+++ b/src/dcp_time.h
@@ -56,7 +56,7 @@ public:
Time () : h (0), m (0), s (0), e (0), tcr (1) {}
/** Construct a Time.
- * @param Frame index (starting from 0).
+ * @param frame Frame index (starting from 0).
* @param frames_per_second Frames per second.
* @param tcr Timecode rate.
*/
diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h
index e5ac5e96..ffe5b6d9 100644
--- a/src/smpte_subtitle_asset.h
+++ b/src/smpte_subtitle_asset.h
@@ -164,6 +164,7 @@ private:
* 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;