Merge master.

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

diff --git a/src/lib/imagemagick_content.h b/src/lib/imagemagick_content.h
index b1e7f949530a0b70182019639807b58d396b2aaa..d7673d870730ec3dd411e3b875a386f454652c6f 100644 (file)
--- a/src/lib/imagemagick_content.h
+++ b/src/lib/imagemagick_content.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_IMAGEMAGICK_CONTENT_H
+#define DCPOMATIC_IMAGEMAGICK_CONTENT_H
+
 #include <boost/enable_shared_from_this.hpp>
 #include "video_content.h"
 
@@ -27,19 +30,22 @@ namespace cxml {
 class ImageMagickContent : public VideoContent
 {
 public:
-       ImageMagickContent (boost::filesystem::path);
-       ImageMagickContent (boost::shared_ptr<const cxml::Node>);
+       ImageMagickContent (boost::shared_ptr<const Film>, boost::filesystem::path);
+       ImageMagickContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
 
        boost::shared_ptr<ImageMagickContent> shared_from_this () {
                return boost::dynamic_pointer_cast<ImageMagickContent> (Content::shared_from_this ());
        };
 
-       void examine (boost::shared_ptr<Film>, boost::shared_ptr<Job>, bool);
+       void examine (boost::shared_ptr<Job>);
        std::string summary () const;
        void as_xml (xmlpp::Node *) const;
        boost::shared_ptr<Content> clone () const;
+       Time length () const;
 
        void set_video_length (ContentVideoFrame);
 
        static bool valid_file (boost::filesystem::path);
 };
+
+#endif