X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.h;h=dcdb7b526660d53b7b23bf411874637be737100e;hb=6f344b876689a1234a5eb75041882f06f5d9fe5c;hp=e5a0311d97947f816f62dbfc5aefd67a8a9ef282;hpb=ea6240f349a27e1e8f4f03ee69640e3a2939d958;p=dcpomatic.git

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index e5a0311d9..dcdb7b526 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 ());
@@ -41,13 +36,13 @@ public:
 	std::string summary () const;
 	std::string technical_summary () const;
 	void as_xml (xmlpp::Node *) const;
-	Time full_length () const;
+	DCPTime full_length () const;
 
 	std::string identifier () const;
-	
-	void set_video_length (VideoContent::Frame);
+
+	void set_default_colour_conversion ();
+
 	bool still () const;
-	void set_video_frame_rate (float);
 };
 
 #endif