X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.h;h=11c932153adba433c64174ba6fc14ec97908f069;hb=387304bc9147933b68eda2b38ba8cac0d250e87e;hp=6db24767d5af5850a418444f204f69b896bb6f5b;hpb=2c0478d2b33906845b9d910668b12fe3e8f03a7c;p=dcpomatic.git

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index 6db24767d..11c932153 100644
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -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
@@ -20,8 +20,8 @@
 #ifndef DCPOMATIC_IMAGE_CONTENT_H
 #define DCPOMATIC_IMAGE_CONTENT_H
 
-#include <boost/enable_shared_from_this.hpp>
 #include "video_content.h"
+#include <boost/enable_shared_from_this.hpp>
 
 namespace cxml {
 	class Node;
@@ -31,7 +31,7 @@ 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 +44,11 @@ public:
 	DCPTime full_length () const;
 
 	std::string identifier () const;
+
+	/* VideoContent */
+	void set_default_colour_conversion ();
 	
-	void set_video_length (ContentTime);
+	void set_video_length (Frame);
 	bool still () const;
 	void set_video_frame_rate (float);
 };