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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index c84ba7d29..d8f482a3b 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -18,31 +18,35 @@
 
 */
 
-#include "image_content.h"
-#include "video_content.h"
-#include "image_examiner.h"
+
 #include "compose.hpp"
+#include "exceptions.h"
 #include "film.h"
-#include "job.h"
 #include "frame_rate_change.h"
-#include "exceptions.h"
+#include "image_content.h"
+#include "image_examiner.h"
 #include "image_filename_sorter.h"
+#include "job.h"
+#include "video_content.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
-using std::string;
+
 using std::cout;
 using std::list;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
 using std::vector;
-using boost::shared_ptr;
+using namespace dcpomatic;
+
 
 ImageContent::ImageContent (boost::filesystem::path p)
 {
-	video.reset (new VideoContent (this));
+	video = make_shared<VideoContent>(this);
 
 	if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
 		add_path (p);
@@ -57,9 +61,10 @@ ImageContent::ImageContent (boost::filesystem::path p)
 ImageContent::ImageContent (cxml::ConstNodePtr node, int version)
 	: Content (node)
 {
-	video = VideoContent::from_xml (this, node, version);
+	video = VideoContent::from_xml (this, node, version, VideoRange::FULL);
 }
 
+
 string
 ImageContent::summary () const
 {
@@ -74,6 +79,7 @@ ImageContent::summary () const
 	return s;
 }
 
+
 string
 ImageContent::technical_summary () const
 {
@@ -89,6 +95,7 @@ ImageContent::technical_summary () const
 	return s;
 }
 
+
 void
 ImageContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
@@ -100,6 +107,7 @@ ImageContent::as_xml (xmlpp::Node* node, bool with_paths) const
 	}
 }
 
+
 void
 ImageContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
@@ -107,9 +115,9 @@ ImageContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 		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());
+		for (auto i: boost::filesystem::directory_iterator(*_path_to_scan)) {
+			if (boost::filesystem::is_regular_file(i.path()) && valid_image_file (i.path())) {
+				paths.push_back (i.path());
 			}
 			++n;
 			if ((n % 1000) == 0) {
@@ -127,11 +135,12 @@ ImageContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 
 	Content::examine (film, job);
 
-	shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
+	auto examiner = make_shared<ImageExaminer>(film, shared_from_this(), job);
 	video->take_from_examiner (examiner);
 	set_default_colour_conversion ();
 }
 
+
 DCPTime
 ImageContent::full_length (shared_ptr<const Film> film) const
 {
@@ -139,6 +148,14 @@ 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
 {
@@ -147,16 +164,18 @@ ImageContent::identifier () const
 	return buffer;
 }
 
+
 bool
 ImageContent::still () const
 {
 	return number_of_paths() == 1;
 }
 
+
 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 ();
@@ -175,9 +194,10 @@ 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);
 }