X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.h;h=353ce8370eb451050ab554210056d32c8b715e65;hb=3ef438f90729d78ad579bbeb7933b3cf4f09c10c;hp=f929e2b6f15b72105a6a97880e6bef647eb98175;hpb=8353a009aae1a604251c0160193c39741c2fa27c;p=dcpomatic.git

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index f929e2b6f..353ce8370 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-2016 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"
+#include "content.h"
 
-namespace cxml {
-	class Node;
-}
-
-class ImageContent : public VideoContent
+class ImageContent : public Content
 {
 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,10 +39,13 @@ public:
 	DCPTime full_length () const;
 
 	std::string identifier () const;
-	
-	void set_video_length (VideoFrame);
+
+	void set_default_colour_conversion ();
+
+	void set_video_length (Frame);
 	bool still () const;
-	void set_video_frame_rate (float);
+
+	boost::shared_ptr<VideoContent> video;
 };
 
 #endif