Merge master.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 162b67b351bd6b9d0e2a97a6dc60e5b1e49387e1..9d1445d927b81ab7333f3197d2891ef1306de809 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -31,8 +31,8 @@
 #include <boost/signals2.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/key.h>
-#include <libdcp/kdm.h>
+#include <dcp/key.h>
+#include <dcp/kdm.h>
 #include "util.h"
 #include "types.h"
 #include "dci_metadata.h"
@@ -95,20 +95,15 @@ public:
                return _dirty;
        }
 
-       libdcp::Size full_frame () const;
-       libdcp::Size frame_size () const;
+       dcp::Size full_frame () const;
+       dcp::Size frame_size () 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;
-
-       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;
+       int audio_frame_rate () const;
 
        uint64_t required_disk_space () const;
        bool should_be_enough_disk_space (double &, double &) const;
@@ -116,26 +111,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;
+       int 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;
        }
 
@@ -328,7 +324,7 @@ private:
        bool _three_d;
        bool _sequence_video;
        bool _interop;
-       libdcp::Key _key;
+       dcp::Key _key;
 
        int _state_version;