X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=517d6792f89715d16f83edcaa60779f40a7e99ee;hp=53f0aa8c2f7f3bbf9e4b5bb8229bbc903af63d02;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=e2ebf847ce9d6e74a1b9d768475b8ae552cfba82

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 53f0aa8c2..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,10 +37,10 @@ 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 (shared_ptr<const Film> film, boost::filesystem::path p)
-	: Content (film)
+ImageContent::ImageContent (boost::filesystem::path p)
 {
 	video.reset (new VideoContent (this));
 
@@ -55,8 +54,8 @@ ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path
 }
 
 
-ImageContent::ImageContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
-	: Content (film, node)
+ImageContent::ImageContent (cxml::ConstNodePtr node, int version)
+	: Content (node)
 {
 	video = VideoContent::from_xml (this, node, version);
 }
@@ -102,7 +101,7 @@ ImageContent::as_xml (xmlpp::Node* node, bool with_paths) const
 }
 
 void
-ImageContent::examine (shared_ptr<Job> job)
+ImageContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
 	if (_path_to_scan) {
 		job->sub (_("Scanning image files"));
@@ -110,7 +109,7 @@ ImageContent::examine (shared_ptr<Job> job)
 		int n = 0;
 		for (boost::filesystem::directory_iterator i(*_path_to_scan); i != boost::filesystem::directory_iterator(); ++i) {
 			if (boost::filesystem::is_regular_file (i->path()) && valid_image_file (i->path())) {
-				add_path (i->path());
+				paths.push_back (i->path());
 			}
 			++n;
 			if ((n % 1000) == 0) {
@@ -126,10 +125,7 @@ ImageContent::examine (shared_ptr<Job> job)
 		set_paths (paths);
 	}
 
-	Content::examine (job);
-
-	shared_ptr<const Film> film = _film.lock ();
-	DCPOMATIC_ASSERT (film);
+	Content::examine (film, job);
 
 	shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
 	video->take_from_examiner (examiner);
@@ -137,12 +133,16 @@ ImageContent::examine (shared_ptr<Job> job)
 }
 
 DCPTime
-ImageContent::full_length () const
+ImageContent::full_length (shared_ptr<const Film> film) const
+{
+	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
 {
-	shared_ptr<const Film> film = _film.lock ();
-	DCPOMATIC_ASSERT (film);
-	FrameRateChange const frc (active_video_frame_rate(), film->video_frame_rate());
-	return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor ()), film->video_frame_rate ());
+	return DCPTime::from_frames (video->length_after_3d_combine(), 24);
 }
 
 string
@@ -162,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 ();
@@ -182,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);
 }