X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=8cf44bda1fd870682575f9bc3a6410b59f92bc5b;hp=191359ff35a8e35c822215cf98abb3a4d4073674;hb=56caa542a558a3e261a3da4773c9ed3e66e262ab;hpb=513ac2cefb0ca8ebe6762cc1313ea9be813c646f

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 191359ff3..8cf44bda1 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -37,15 +37,16 @@
 using std::string;
 using std::cout;
 using std::list;
+using std::vector;
 using boost::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));
 
 	if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
-		_paths.push_back (p);
+		add_path (p);
 	} else {
 		_path_to_scan = p;
 	}
@@ -54,8 +55,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);
 }
@@ -101,28 +102,31 @@ 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"));
+		vector<boost::filesystem::path> paths;
+		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())) {
-				_paths.push_back (i->path ());
+				paths.push_back (i->path());
+			}
+			++n;
+			if ((n % 1000) == 0) {
+				job->set_progress_unknown ();
 			}
-			job->set_progress_unknown ();
 		}
 
-		if (_paths.empty()) {
+		if (paths.empty()) {
 			throw FileError (_("No valid image files were found in the folder."), *_path_to_scan);
 		}
 
-		sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
+		sort (paths.begin(), paths.end(), ImageFilenameSorter());
+		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);
@@ -130,12 +134,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
@@ -155,7 +163,7 @@ ImageContent::still () const
 void
 ImageContent::set_default_colour_conversion ()
 {
-	BOOST_FOREACH (boost::filesystem::path i, _paths) {
+	BOOST_FOREACH (boost::filesystem::path i, paths()) {
 		if (valid_j2k_file (i)) {
 			/* We default to no colour conversion if we have JPEG2000 files */
 			video->unset_colour_conversion ();
@@ -175,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);
 }