X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=08b9fd6ae475a364dd367f48274ef28e23ebf5d0;hp=c415f933dd637c696a57ce07ef23863e233d65c0;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=0973ea8c5ddc0a7463eaf0e2d0e267c525acbab5

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index c415f933d..08b9fd6ae 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -1,31 +1,33 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "image_content.h"
+#include "video_content.h"
 #include "image_examiner.h"
 #include "compose.hpp"
 #include "film.h"
 #include "job.h"
 #include "frame_rate_change.h"
 #include "exceptions.h"
-#include "safe_stringstream.h"
 #include "image_filename_sorter.h"
+#include <locked_sstream.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
@@ -35,12 +37,14 @@
 
 using std::string;
 using std::cout;
+using std::list;
 using boost::shared_ptr;
 
 ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path p)
 	: Content (film)
-	, VideoContent (film)
 {
+	video.reset (new VideoContent (this));
+
 	if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
 		_paths.push_back (p);
 	} else {
@@ -56,14 +60,15 @@ ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path
 
 		sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
 	}
+
+	set_default_colour_conversion ();
 }
 
 
 ImageContent::ImageContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
 	: Content (film, node)
-	, VideoContent (film, node, version)
 {
-
+	video = VideoContent::from_xml (this, node, version);
 }
 
 string
@@ -84,7 +89,7 @@ string
 ImageContent::technical_summary () const
 {
 	string s = Content::technical_summary() + " - "
-		+ VideoContent::technical_summary() + " - ";
+		+ video->technical_summary() + " - ";
 
 	if (still ()) {
 		s += _("still");
@@ -100,7 +105,10 @@ ImageContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("Image");
 	Content::as_xml (node);
-	VideoContent::as_xml (node);
+
+	if (video) {
+		video->as_xml (node);
+	}
 }
 
 void
@@ -112,18 +120,8 @@ ImageContent::examine (shared_ptr<Job> job)
 	DCPOMATIC_ASSERT (film);
 
 	shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
-	take_from_video_examiner (examiner);
-}
-
-void
-ImageContent::set_video_length (Frame len)
-{
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_video_length = len;
-	}
-
-	signal_changed (ContentProperty::LENGTH);
+	video->take_from_examiner (examiner);
+	set_default_colour_conversion ();
 }
 
 DCPTime
@@ -131,16 +129,17 @@ ImageContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
-	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 ());
+	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 ());
 }
 
 string
 ImageContent::identifier () const
 {
-	SafeStringStream s;
-	s << VideoContent::identifier ();
-	s << "_" << video_length();
+	locked_stringstream s;
+	s << Content::identifier();
+	s << "_" << video->identifier ();
+	s << "_" << video->length();
 	return s.str ();
 }
 
@@ -156,7 +155,7 @@ 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 ();
+			video->unset_colour_conversion ();
 			return;
 		}
 	}
@@ -166,8 +165,15 @@ ImageContent::set_default_colour_conversion ()
 	boost::mutex::scoped_lock lm (_mutex);
 
 	if (s) {
-		_colour_conversion = PresetColourConversion::from_id ("srgb").conversion;
+		video->set_colour_conversion (PresetColourConversion::from_id ("srgb").conversion);
 	} else {
-		_colour_conversion = PresetColourConversion::from_id ("rec709").conversion;
+		video->set_colour_conversion (PresetColourConversion::from_id ("rec709").conversion);
 	}
 }
+
+void
+ImageContent::add_properties (list<UserProperty>& p) const
+{
+	Content::add_properties (p);
+	video->add_properties (p);
+}