Fix daft mistake in time fixups causing end trim to be added to length.
authorCarl Hetherington <cth@carlh.net>
Sun, 19 Jul 2015 21:06:52 +0000 (22:06 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 19 Jul 2015 21:06:52 +0000 (22:06 +0100)
src/lib/content.cc

index 65c005157846338dbb8f07889cc74885a30a6030..f0d35186abde70627236c808658a4126f70aa1b0 100644 (file)
@@ -223,7 +223,7 @@ Content::length_after_trim () const
 {
        shared_ptr<const Film> film = _film.lock ();
        DCPOMATIC_ASSERT (film);
-       return max (DCPTime (), full_length() - DCPTime (trim_start() - trim_end(), film->active_frame_rate_change (position ())));
+       return max (DCPTime (), full_length() - DCPTime (trim_start() + trim_end(), film->active_frame_rate_change (position ())));
 }
 
 /** @return string which includes everything about how this content affects