X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=920d7ae54753db4b4b4bbe1f223e48b4cb94d766;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=4073cd52c7facf71117f43b3d33a0c044359d01e;hpb=e8fc5f57348dd41ac4996f296c98bb7855435c12;p=dcpomatic.git

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 4073cd52c..920d7ae54 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
@@ -29,16 +29,18 @@
 
 #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)
 {
 	bool have_j2k = false;
-	if (boost::filesystem::is_regular_file (p)) {
+	if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
 		_paths.push_back (p);
 		if (valid_j2k_file (p)) {
 			have_j2k = true;
@@ -56,22 +58,22 @@ 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 ());
 	}
 
 	if (have_j2k) {
 		/* We default to no colour conversion if we have JPEG2000 files */
-		unset_colour_conversion ();
+		unset_colour_conversion (false);
 	}
 }
 
 
-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
@@ -118,13 +120,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);
@@ -139,7 +141,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 (rint (video_length_after_3d_combine() * frc.factor ()), film->video_frame_rate ());
 }
 
 string
@@ -147,7 +150,7 @@ ImageContent::identifier () const
 {
 	SafeStringStream s;
 	s << VideoContent::identifier ();
-	s << "_" << video_length().get();
+	s << "_" << video_length();
 	return s.str ();
 }
 
@@ -165,10 +168,23 @@ 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 ()
+{
+	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;
+	}
+}