X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_markers_asset.cc;h=ba0021cfc156fb7c13fef27befc3973f74744493;hb=6af628a0404e7135cb77cfa6d49a8419c883f2bf;hp=c0ad6b57a8a5a7ca5278a2653dd106d3f8c41d26;hpb=7e8eb7e247c69918c5f35864a392cffa81924287;p=libdcp.git

diff --git a/src/reel_markers_asset.cc b/src/reel_markers_asset.cc
index c0ad6b57..ba0021cf 100644
--- a/src/reel_markers_asset.cc
+++ b/src/reel_markers_asset.cc
@@ -44,8 +44,8 @@ using boost::optional;
 using std::shared_ptr;
 using namespace dcp;
 
-ReelMarkersAsset::ReelMarkersAsset (Fraction edit_rate, int64_t entry_point)
-	: ReelAsset (make_uuid(), edit_rate, 0, entry_point)
+ReelMarkersAsset::ReelMarkersAsset (Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
+	: ReelAsset (make_uuid(), edit_rate, intrinsic_duration, entry_point)
 {
 
 }
@@ -70,14 +70,12 @@ void
 ReelMarkersAsset::set (Marker m, Time t)
 {
 	_markers[m] = t;
-	update_duration ();
 }
 
 void
 ReelMarkersAsset::unset (Marker m)
 {
 	_markers.erase (m);
-	update_duration ();
 }
 
 optional<Time>
@@ -90,17 +88,6 @@ ReelMarkersAsset::get (Marker m) const
 	return i->second;
 }
 
-void
-ReelMarkersAsset::update_duration ()
-{
-	int const tcr = edit_rate().numerator / edit_rate().denominator;
-	_intrinsic_duration = 0;
-	for (map<Marker, Time>::const_iterator i = _markers.begin(); i != _markers.end(); ++i) {
-		_intrinsic_duration = max(_intrinsic_duration, i->second.as_editable_units(tcr));
-	}
-	_duration = _intrinsic_duration;
-}
-
 xmlpp::Node*
 ReelMarkersAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 {