Merge master; specify libdcp-1.0.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 7e65ecb16346107efe63da496176f5cf2f014adf..0a474bab7f91b52b530cf12cb261da437e22f545 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -95,19 +95,19 @@ public:
                return _dirty;
        }
 
-       libdcp::Size full_frame () const;
+       dcp::Size full_frame () const;
 
        std::list<boost::filesystem::path> dcps () const;
 
        boost::shared_ptr<Player> make_player () const;
        boost::shared_ptr<Playlist> playlist () const;
 
-       OutputAudioFrame audio_frame_rate () const;
+       AudioFrame 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;
+       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;
 
        uint64_t required_disk_space () const;
        bool should_be_enough_disk_space (double &, double &) const;
@@ -115,26 +115,27 @@ public:
        /* Proxies for some Playlist methods */
 
        ContentList content () const;
-       Time length () const;
+       DCPTime length () const;
        bool has_subtitles () const;
-       OutputVideoFrame best_video_frame_rate () const;
+       VideoFrame best_video_frame_rate () const;
+       FrameRateChange active_frame_rate_change (DCPTime) const;
 
-       libdcp::KDM
+       dcp::KDM
        make_kdm (
-               boost::shared_ptr<libdcp::Certificate> target,
+               boost::shared_ptr<dcp::Certificate> target,
                boost::filesystem::path dcp,
                boost::posix_time::ptime from,
                boost::posix_time::ptime until
                ) const;
        
-       std::list<libdcp::KDM> make_kdms (
+       std::list<dcp::KDM> make_kdms (
                std::list<boost::shared_ptr<Screen> >,
                boost::filesystem::path dcp,
                boost::posix_time::ptime from,
                boost::posix_time::ptime until
                ) const;
 
-       libdcp::Key key () const {
+       dcp::Key key () const {
                return _key;
        }
 
@@ -327,7 +328,7 @@ private:
        bool _three_d;
        bool _sequence_video;
        bool _interop;
-       libdcp::Key _key;
+       dcp::Key _key;
 
        int _state_version;