X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=d62954f40f9cda054248ebf0ac02f1999b578461;hp=1dbd7871b9f9a22d51f2a296094209499922bb87;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=59e769023c392c332331567a1aea94660002c463

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 1dbd7871b..d62954f40 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@
 
 */
 
-#include <libcxml/cxml.h>
 #include "image_content.h"
 #include "image_examiner.h"
 #include "compose.hpp"
@@ -26,18 +25,24 @@
 #include "frame_rate_change.h"
 #include "exceptions.h"
 #include "safe_stringstream.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
+#include "image_filename_sorter.cc"
+
 using std::string;
 using std::cout;
 using boost::shared_ptr;
 
-ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
-	: Content (f)
-	, VideoContent (f)
+ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path p)
+	: Content (film)
+	, VideoContent (film)
 {
-	if (boost::filesystem::is_regular_file (p)) {
+	if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
 		_paths.push_back (p);
 	} else {
 		for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
@@ -49,17 +54,17 @@ ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
 		if (_paths.empty()) {
 			throw FileError (_("No valid image files were found in the folder."), p);
 		}
-		       		
-		sort (_paths.begin(), _paths.end());
+
+		sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
 	}
 }
 
 
-ImageContent::ImageContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
-	: Content (f, node)
-	, VideoContent (f, node, version)
+ImageContent::ImageContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+	: Content (film, node)
+	, VideoContent (film, node, version)
 {
-	
+
 }
 
 string
@@ -106,13 +111,13 @@ ImageContent::examine (shared_ptr<Job> job)
 
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
-	
+
 	shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
 	take_from_video_examiner (examiner);
 }
 
 void
-ImageContent::set_video_length (ContentTime len)
+ImageContent::set_video_length (Frame len)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -127,7 +132,8 @@ ImageContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
-	return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
+	FrameRateChange const frc (video_frame_rate(), film->video_frame_rate());
+	return DCPTime::from_frames (llrint (video_length_after_3d_combine() * frc.factor ()), film->video_frame_rate ());
 }
 
 string
@@ -135,7 +141,7 @@ ImageContent::identifier () const
 {
 	SafeStringStream s;
 	s << VideoContent::identifier ();
-	s << "_" << video_length().get();
+	s << "_" << video_length();
 	return s.str ();
 }
 
@@ -153,10 +159,31 @@ ImageContent::set_video_frame_rate (float r)
 		if (_video_frame_rate == r) {
 			return;
 		}
-		
+
 		_video_frame_rate = r;
 	}
-	
+
 	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
 }
 
+void
+ImageContent::set_default_colour_conversion ()
+{
+	BOOST_FOREACH (boost::filesystem::path i, _paths) {
+		if (valid_j2k_file (i)) {
+			/* We default to no colour conversion if we have JPEG2000 files */
+			unset_colour_conversion ();
+			return;
+		}
+	}
+
+	bool const s = still ();
+
+	boost::mutex::scoped_lock lm (_mutex);
+
+	if (s) {
+		_colour_conversion = PresetColourConversion::from_id ("srgb").conversion;
+	} else {
+		_colour_conversion = PresetColourConversion::from_id ("rec709").conversion;
+	}
+}