Basic detach of FFmpegContent, ImageContent, DCPContent

[dcpomatic.git] / src / lib / image_content.h

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index 8c50fd8a87f89cd0115d2a4e49b462d3af976448..353ce8370eb451050ab554210056d32c8b715e65 100644 (file)
--- 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-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,14 +20,9 @@
 #ifndef DCPOMATIC_IMAGE_CONTENT_H
 #define DCPOMATIC_IMAGE_CONTENT_H
 
-#include "video_content.h"
-#include <boost/enable_shared_from_this.hpp>
+#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);
@@ -37,17 +32,20 @@ public:
                return boost::dynamic_pointer_cast<ImageContent> (Content::shared_from_this ());
        };
 
-       void examine (boost::shared_ptr<Job>, bool calculate_digest);
+       void examine (boost::shared_ptr<Job>);
        std::string summary () const;
        std::string technical_summary () const;
        void as_xml (xmlpp::Node *) const;
        DCPTime full_length () const;
 
        std::string identifier () const;
-       
-       void set_video_length (ContentTime);
+
+       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