X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=ca8bd380f1c6259821a46129e84ca684cda830b1;hp=ef82b3779d29d60b4a2231fb2e4f0ab200e88857;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hpb=90becb40eb48467b6d31d6939bcfcf39c3c9652c

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index ef82b3779..ca8bd380f 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/>.
 
 */
 
@@ -30,18 +31,21 @@
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
+using std::list;
 using boost::shared_ptr;
+using boost::make_shared;
 
 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 +70,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 = VideoContent::from_xml (this, film, node, version);
+	video = VideoContent::from_xml (this, node, version);
 }
 
 string
@@ -117,7 +121,7 @@ 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));
+	shared_ptr<ImageExaminer> examiner = make_shared<ImageExaminer> (film, shared_from_this(), job);
 	video->take_from_examiner (examiner);
 	set_default_colour_conversion ();
 }
@@ -168,3 +172,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);
+}