New DCPTime/ContentTime types.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 51e272faa2379c778736a3cb984c862415f7c62e..f776a3f72da22a440b8360128405f6384f523cab 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -102,12 +102,7 @@ public:
        boost::shared_ptr<Player> make_player () const;
        boost::shared_ptr<Playlist> playlist () const;
 
-       AudioFrame audio_frame_rate () const;
-
-       AudioFrame time_to_audio_frames (DCPTime) const;
-       VideoFrame time_to_video_frames (DCPTime) const;
-       DCPTime video_frames_to_time (VideoFrame) const;
-       DCPTime audio_frames_to_time (AudioFrame) const;
+       int audio_frame_rate () const;
 
        uint64_t required_disk_space () const;
        bool should_be_enough_disk_space (double &, double &) const;
@@ -117,7 +112,7 @@ public:
        ContentList content () const;
        DCPTime length () const;
        bool has_subtitles () const;
-       VideoFrame best_video_frame_rate () const;
+       int best_video_frame_rate () const;
        FrameRateChange active_frame_rate_change (DCPTime) const;
 
        dcp::KDM