X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.h;h=a4968ea8b753937f11260c29c2a0c3edccf3065f;hb=d2728b07a42b0da60effd259b508761e670c0789;hp=88c178faad35578cc5e7143f334c9feb1d22dbef;hpb=a5b59faff75265d3256ad0dbd9f0c69e51e31ce4;p=dcpomatic.git

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index 88c178faa..a4968ea8b 100644
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 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
@@ -20,18 +20,13 @@
 #ifndef DCPOMATIC_IMAGE_CONTENT_H
 #define DCPOMATIC_IMAGE_CONTENT_H
 
-#include <boost/enable_shared_from_this.hpp>
 #include "video_content.h"
 
-namespace cxml {
-	class Node;
-}
-
 class ImageContent : public VideoContent
 {
 public:
 	ImageContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	ImageContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int);
+	ImageContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
 
 	boost::shared_ptr<ImageContent> shared_from_this () {
 		return boost::dynamic_pointer_cast<ImageContent> (Content::shared_from_this ());
@@ -44,8 +39,11 @@ public:
 	DCPTime full_length () const;
 
 	std::string identifier () const;
-	
-	void set_video_length (VideoContent::Frame);
+
+	/* VideoContent */
+	void set_default_colour_conversion ();
+
+	void set_video_length (Frame);
 	bool still () const;
 };