Merge 1.0

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

diff --git a/src/lib/film.h b/src/lib/film.h
index e318f772492fc83777b5169170ff822779c88c08..f1564e83bece00051f16140df7f6c8bb435e6aa2 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -103,17 +103,18 @@ public:
 
        OutputAudioFrame audio_frame_rate () const;
 
-       OutputAudioFrame time_to_audio_frames (Time) const;
-       OutputVideoFrame time_to_video_frames (Time) const;
-       Time video_frames_to_time (OutputVideoFrame) const;
-       Time audio_frames_to_time (OutputAudioFrame) const;
+       OutputAudioFrame time_to_audio_frames (DCPTime) const;
+       OutputVideoFrame time_to_video_frames (DCPTime) const;
+       DCPTime video_frames_to_time (OutputVideoFrame) const;
+       DCPTime audio_frames_to_time (OutputAudioFrame) const;
 
        /* Proxies for some Playlist methods */
 
        ContentList content () const;
-       Time length () const;
+       DCPTime length () const;
        bool has_subtitles () const;
        OutputVideoFrame best_video_frame_rate () const;
+       FrameRateChange active_frame_rate_change (DCPTime) const;
 
        libdcp::KDM
        make_kdm (