X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=825f6da25aab1267bffe75f8fba442585c4a44e6;hp=231eb9f8c163c117c5b88941f9c52350613e1554;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hpb=6f344b876689a1234a5eb75041882f06f5d9fe5c

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 231eb9f8c..825f6da25 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -1,19 +1,20 @@
 /*
-    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/>.
 
 */
 
@@ -25,7 +26,6 @@
 #include "job.h"
 #include "frame_rate_change.h"
 #include "exceptions.h"
-#include "safe_stringstream.h"
 #include "image_filename_sorter.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
@@ -36,12 +36,13 @@
 
 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)
 {
-	video.reset (new VideoContent (this, film));
+	video.reset (new VideoContent (this));
 
 	if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
 		_paths.push_back (p);
@@ -66,7 +67,7 @@ ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path
 ImageContent::ImageContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
 	: Content (film, node)
 {
-	video.reset (new VideoContent (this, film, node, version));
+	video = VideoContent::from_xml (this, node, version);
 }
 
 string
@@ -103,7 +104,10 @@ ImageContent::as_xml (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text ("Image");
 	Content::as_xml (node);
-	video->as_xml (node);
+
+	if (video) {
+		video->as_xml (node);
+	}
 }
 
 void
@@ -115,7 +119,7 @@ ImageContent::examine (shared_ptr<Job> job)
 	DCPOMATIC_ASSERT (film);
 
 	shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
-	video->take_from_video_examiner (examiner);
+	video->take_from_examiner (examiner);
 	set_default_colour_conversion ();
 }
 
@@ -124,18 +128,16 @@ ImageContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
-	FrameRateChange const frc (video->video_frame_rate(), film->video_frame_rate());
-	return DCPTime::from_frames (llrint (video->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 << Content::identifier();
-	s << "_" << video->identifier ();
-	s << "_" << video->video_length();
-	return s.str ();
+	char buffer[256];
+	snprintf (buffer, sizeof(buffer), "%s_%s_%" PRId64, Content::identifier().c_str(), video->identifier().c_str(), video->length());
+	return buffer;
 }
 
 bool
@@ -165,3 +167,10 @@ ImageContent::set_default_colour_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);
+}