Merge remote-tracking branch 'origin/master' into 2.0

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

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index e56abce4a07a8218ab0ad4a7a1b26280d131adce..a1b1437c811fb391154b222466b7fa22a27b5258 100644 (file)
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -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 ());
@@ -41,11 +41,11 @@ 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_video_length (ContentTime);
        bool still () const;
        void set_video_frame_rate (float);
 };