X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=517d6792f89715d16f83edcaa60779f40a7e99ee;hp=55ffac4f251f786ba9393307d1df24e561e0a785;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 55ffac4f2..517d6792f 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -29,7 +29,6 @@
 #include "image_filename_sorter.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -38,7 +37,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)
 {
@@ -135,10 +135,16 @@ ImageContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 DCPTime
 ImageContent::full_length (shared_ptr<const Film> film) const
 {
-	FrameRateChange const frc (active_video_frame_rate(film), film->video_frame_rate());
+	FrameRateChange const frc (film, shared_from_this());
 	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
 {
@@ -156,7 +162,7 @@ ImageContent::still () const
 void
 ImageContent::set_default_colour_conversion ()
 {
-	BOOST_FOREACH (boost::filesystem::path i, paths()) {
+	for (auto i: paths()) {
 		if (valid_j2k_file (i)) {
 			/* We default to no colour conversion if we have JPEG2000 files */
 			video->unset_colour_conversion ();
@@ -176,8 +182,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);
 }