X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=20f32c05dc0310c6d14b2a5d30758711c8218e1d;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=c84ba7d29019c3f0575170678254c4649f27c97d;hpb=f67bc45820b4e56f90eecb97ba3b7762c119f9b5;p=dcpomatic.git

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index c84ba7d29..20f32c05d 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -38,7 +38,8 @@ using std::string;
 using std::cout;
 using std::list;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
+using namespace dcpomatic;
 
 ImageContent::ImageContent (boost::filesystem::path p)
 {
@@ -139,6 +140,12 @@ ImageContent::full_length (shared_ptr<const Film> film) const
 	return DCPTime::from_frames (llrint(video->length_after_3d_combine() * frc.factor()), film->video_frame_rate());
 }
 
+DCPTime
+ImageContent::approximate_length () const
+{
+	return DCPTime::from_frames (video->length_after_3d_combine(), 24);
+}
+
 string
 ImageContent::identifier () const
 {
@@ -176,8 +183,8 @@ ImageContent::set_default_colour_conversion ()
 }
 
 void
-ImageContent::add_properties (list<UserProperty>& p) const
+ImageContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
 {
-	Content::add_properties (p);
+	Content::add_properties (film, p);
 	video->add_properties (p);
 }