Back port active_frame_rate_change stuff from v2, removing specification of video...

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 7e65ecb16346107efe63da496176f5cf2f014adf..909bc0beb51aacda7ea755c67e987f19f8ebaf1a 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -36,6 +36,7 @@
 #include "util.h"
 #include "types.h"
 #include "dci_metadata.h"
+#include "frame_rate_change.h"
 
 class DCPContentType;
 class Log;
@@ -63,7 +64,7 @@ public:
        boost::filesystem::path info_path (int, Eyes) const;
        boost::filesystem::path internal_video_mxf_dir () const;
        boost::filesystem::path internal_video_mxf_filename () const;
-       boost::filesystem::path audio_analysis_path (boost::shared_ptr<const AudioContent>) const;
+       boost::filesystem::path audio_analysis_dir () const;
 
        boost::filesystem::path video_mxf_filename () const;
        boost::filesystem::path audio_mxf_filename () const;
@@ -83,7 +84,7 @@ public:
        boost::filesystem::path file (boost::filesystem::path f) const;
        boost::filesystem::path dir (boost::filesystem::path d) const;
 
-       void read_metadata ();
+       std::list<std::string> read_metadata ();
        void write_metadata () const;
        boost::shared_ptr<xmlpp::Document> metadata () const;
 
@@ -96,8 +97,9 @@ public:
        }
 
        libdcp::Size full_frame () const;
+       libdcp::Size frame_size () const;
 
-       std::list<boost::filesystem::path> dcps () const;
+       std::vector<CPLSummary> cpls () const;
 
        boost::shared_ptr<Player> make_player () const;
        boost::shared_ptr<Playlist> playlist () const;
@@ -118,18 +120,19 @@ public:
        Time length () const;
        bool has_subtitles () const;
        OutputVideoFrame best_video_frame_rate () const;
+       FrameRateChange active_frame_rate_change (Time) const;
 
        libdcp::KDM
        make_kdm (
                boost::shared_ptr<libdcp::Certificate> target,
-               boost::filesystem::path dcp,
+               boost::filesystem::path cpl_file,
                boost::posix_time::ptime from,
                boost::posix_time::ptime until
                ) const;
        
        std::list<libdcp::KDM> make_kdms (
                std::list<boost::shared_ptr<Screen> >,
-               boost::filesystem::path dcp,
+               boost::filesystem::path cpl_file,
                boost::posix_time::ptime from,
                boost::posix_time::ptime until
                ) const;