Merge master.

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

diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h
index f5d5150749971c6f874880802e1da1ff09b96555..6ae0422cbbd4477f8ac7878e05a2430b251711b0 100644 (file)
--- a/src/lib/image_examiner.h
+++ b/src/lib/image_examiner.h
@@ -31,14 +31,14 @@ public:
        ImageExaminer (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageContent>, boost::shared_ptr<Job>);
 
        float video_frame_rate () const;
-       libdcp::Size video_size () const;
-       VideoFrame video_length () const {
+       dcp::Size video_size () const;
+       ContentTime video_length () const {
                return _video_length;
        }
 
 private:
        boost::weak_ptr<const Film> _film;
        boost::shared_ptr<const ImageContent> _image_content;
-       boost::optional<libdcp::Size> _video_size;
-       VideoFrame _video_length;
+       boost::optional<dcp::Size> _video_size;
+       ContentTime _video_length;
 };