Merge master.

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

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index e5a0311d97947f816f62dbfc5aefd67a8a9ef282..f929e2b6f15b72105a6a97880e6bef647eb98175 100644 (file)
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -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 (VideoFrame);
        bool still () const;
        void set_video_frame_rate (float);
 };