summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-05-20 14:37:43 +0100
committerCarl Hetherington <cth@carlh.net>2014-05-20 14:37:43 +0100
commit52b34d1a780a9e6dece62fa8fff7467072b9ed66 (patch)
tree25fe8c1811108a0516927a18ecc325848531ca77 /src
parenta8ae455886f36c19257129f34b172051bbe120bf (diff)
Comments.
Diffstat (limited to 'src')
-rw-r--r--src/content.h14
-rw-r--r--src/reel_asset.h14
2 files changed, 21 insertions, 7 deletions
diff --git a/src/content.h b/src/content.h
index 2059c8f5..01b3864b 100644
--- a/src/content.h
+++ b/src/content.h
@@ -51,8 +51,16 @@ namespace dcp
class Content : public Asset
{
public:
+ /** Construct a Content object by reading a file.
+ * @param file File to read.
+ */
Content (boost::filesystem::path file);
+
+ /** Construct a new piece of content with a specified edit rate.
+ * @param edit_rate Edit rate for the content.
+ */
Content (Fraction edit_rate);
+
virtual ~Content () {}
bool equals (
@@ -65,6 +73,9 @@ public:
return _edit_rate;
}
+ /** @return The total length of this content in video frames.
+ * The amount of content presented may be less than this.
+ */
int64_t intrinsic_duration () const {
return _intrinsic_duration;
}
@@ -75,6 +86,9 @@ protected:
virtual std::string asdcp_kind () const = 0;
Fraction _edit_rate;
+ /** The total length of this content in video frames. The amount of
+ * content presented may be less than this.
+ */
int64_t _intrinsic_duration;
};
diff --git a/src/reel_asset.h b/src/reel_asset.h
index a71290ae..828981ef 100644
--- a/src/reel_asset.h
+++ b/src/reel_asset.h
@@ -99,13 +99,13 @@ protected:
private:
- std::string _annotation_text; ///< The <AnnotationText> from the reel's entry for this asset
- Fraction _edit_rate; ///< The <EditRate> from the reel's entry for this asset
- int64_t _intrinsic_duration; ///< The <IntrinsicDuration> from the reel's entry for this asset
- int64_t _entry_point; ///< The <EntryPoint> from the reel's entry for this asset
- int64_t _duration; ///< The <Duration> from the reel's entry for this asset
- std::string _hash; ///< The <Hash> from the reel's entry for this asset
- std::string _key_id; ///< The <KeyId> from the reel's entry for this asset, or empty if there isn't one
+ std::string _annotation_text; ///< The &lt;AnnotationText&gt; from the reel's entry for this asset
+ Fraction _edit_rate; ///< The &lt;EditRate&gt; from the reel's entry for this asset
+ int64_t _intrinsic_duration; ///< The &lt;IntrinsicDuration&gt; from the reel's entry for this asset
+ int64_t _entry_point; ///< The &lt;EntryPoint&gt; from the reel's entry for this asset
+ int64_t _duration; ///< The &lt;Duration&gt; from the reel's entry for this asset
+ std::string _hash; ///< The &lt;Hash&gt; from the reel's entry for this asset
+ std::string _key_id; ///< The &lt;KeyId&gt; from the reel's entry for this asset, or empty if there isn't one
};
}