summaryrefslogtreecommitdiff
path: root/src/reel_asset.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-28 14:52:32 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-28 14:52:32 +0000
commit4126980a15f4f6bb981d0793bd37483456c5bc79 (patch)
treefbc22b199fc7c747aa74e03ef22e65d0d61b2d1c /src/reel_asset.cc
parentd88c2244d4f90d54164fcc856c3ba73809756381 (diff)
Misc fixes.
Diffstat (limited to 'src/reel_asset.cc')
-rw-r--r--src/reel_asset.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/reel_asset.cc b/src/reel_asset.cc
index b25aeb15..fa0068c5 100644
--- a/src/reel_asset.cc
+++ b/src/reel_asset.cc
@@ -40,6 +40,10 @@ ReelAsset::ReelAsset ()
}
+/** Construct a ReelAsset.
+ * @param content Content that this asset refers to.
+ * @param entry_point Entry point to use in that content.
+ */
ReelAsset::ReelAsset (boost::shared_ptr<Content> content, int64_t entry_point)
: Object (content->id ())
, _content (content)
@@ -49,7 +53,8 @@ ReelAsset::ReelAsset (boost::shared_ptr<Content> content, int64_t entry_point)
, _duration (_intrinsic_duration - _entry_point)
, _hash (make_digest (content->file (), 0))
{
-
+ /* default _annotation_text to the leaf name of our file */
+ _annotation_text = content->file().leaf().string ();
}
ReelAsset::ReelAsset (boost::shared_ptr<const cxml::Node> node)