X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=dc1efa965744ca7fcbe238fcce2183e51cda57e0;hb=63643372fea87ee99b87f3a3f5cd434eedb60925;hp=a9cb148c2447920a1db51a8964937fc12d8cffa0;hpb=bd0ddc4da8fa288130dbadd34f84de0ed3368d01;p=dcpomatic.git

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index a9cb148c2..dc1efa965 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,6 +25,10 @@
 #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"
 
@@ -35,45 +38,33 @@ 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;
-		}
 	} else {
 		for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
 			if (boost::filesystem::is_regular_file (i->path()) && valid_image_file (i->path())) {
 				_paths.push_back (i->path ());
-				if (valid_j2k_file (i->path ())) {
-					have_j2k = true;
-				}
 			}
 		}
 
 		if (_paths.empty()) {
 			throw FileError (_("No valid image files were found in the folder."), p);
 		}
-		       		
-		sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
-	}
 
-	if (have_j2k) {
-		/* We default to no colour conversion if we have JPEG2000 files */
-		unset_colour_conversion (false);
+		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
@@ -120,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);
@@ -141,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
@@ -149,7 +141,7 @@ ImageContent::identifier () const
 {
 	SafeStringStream s;
 	s << VideoContent::identifier ();
-	s << "_" << video_length().get();
+	s << "_" << video_length();
 	return s.str ();
 }
 
@@ -160,17 +152,23 @@ ImageContent::still () const
 }
 
 void
-ImageContent::set_video_frame_rate (float r)
+ImageContent::set_default_colour_conversion ()
 {
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		if (_video_frame_rate == r) {
+	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;
 		}
-		
-		_video_frame_rate = r;
 	}
-	
-	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
-}
 
+	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;
+	}
+}