summaryrefslogtreecommitdiff
path: root/src/reel_markers_asset.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-18 00:24:21 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-18 00:24:21 +0100
commit6af628a0404e7135cb77cfa6d49a8419c883f2bf (patch)
treed41d28980a36ee31bfaf18ebc7c20d230f70d994 /src/reel_markers_asset.h
parent7e8eb7e247c69918c5f35864a392cffa81924287 (diff)
Require instrinsic duration of ReelMarkersAsset to be specified on construction.
We need the intrinsic duration to match other assets in the reel, so we can't just calculate it from the markers.
Diffstat (limited to 'src/reel_markers_asset.h')
-rw-r--r--src/reel_markers_asset.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/reel_markers_asset.h b/src/reel_markers_asset.h
index 0066a27d..46542614 100644
--- a/src/reel_markers_asset.h
+++ b/src/reel_markers_asset.h
@@ -40,7 +40,7 @@ namespace dcp {
class ReelMarkersAsset : public ReelAsset
{
public:
- ReelMarkersAsset (Fraction edit_rate, int64_t entry_point);
+ ReelMarkersAsset (Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
explicit ReelMarkersAsset (std::shared_ptr<const cxml::Node>);
xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const;
@@ -57,8 +57,6 @@ protected:
std::string cpl_node_name (Standard) const;
private:
- void update_duration ();
-
std::map<Marker, Time> _markers;
};