X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=af85e0ff08d17fcbf7fd4111ce27988d9fe405dd;hb=7998c12eb59c07f583db27a250ff566b543bf40b;hp=65c005157846338dbb8f07889cc74885a30a6030;hpb=23b69b228ed5b34b59e1789de4bff052bc905ae4;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 65c005157..af85e0ff0 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -28,10 +28,12 @@
 #include "film.h"
 #include "safe_stringstream.h"
 #include "job.h"
+#include "compose.hpp"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/thread/mutex.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -221,13 +223,11 @@ Content::technical_summary () const
 DCPTime
 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
- *  its playlist.
+/** @return string which changes when something about this content changes which affects
+ *  the appearance of its video.
  */
 string
 Content::identifier () const
@@ -287,3 +287,11 @@ Content::properties () const
 	add_properties (p);
 	return p;
 }
+
+shared_ptr<const Film>
+Content::film () const
+{
+	shared_ptr<const Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	return film;
+}