Merge master.

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

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index ef2bc0447c9262e13357154f5f3c313996bccfb3..a1b1437c811fb391154b222466b7fa22a27b5258 100644 (file)
--- 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-2014 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
@@ -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 ());
@@ -45,8 +45,9 @@ public:
 
        std::string identifier () const;
        
-       void set_video_length (VideoFrame);
+       void set_video_length (ContentTime);
        bool still () const;
+       void set_video_frame_rate (float);
 };
 
 #endif