Merge.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index f776a3f72da22a440b8360128405f6384f523cab..ee8756b3dfdcf860d837c0dd90a11188427bd350 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -32,7 +32,8 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/filesystem.hpp>
 #include <dcp/key.h>
-#include <dcp/kdm.h>
+#include <dcp/decrypted_kdm.h>
+#include <dcp/encrypted_kdm.h>
 #include "util.h"
 #include "types.h"
 #include "dci_metadata.h"
@@ -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,6 +97,7 @@ public:
        }
 
        dcp::Size full_frame () const;
+       dcp::Size frame_size () const;
 
        std::list<boost::filesystem::path> dcps () const;
 
@@ -115,19 +117,19 @@ public:
        int best_video_frame_rate () const;
        FrameRateChange active_frame_rate_change (DCPTime) const;
 
-       dcp::KDM
+       dcp::EncryptedKDM
        make_kdm (
                boost::shared_ptr<dcp::Certificate> target,
                boost::filesystem::path dcp,
-               boost::posix_time::ptime from,
-               boost::posix_time::ptime until
+               dcp::LocalTime from,
+               dcp::LocalTime until
                ) const;
        
-       std::list<dcp::KDM> make_kdms (
+       std::list<dcp::EncryptedKDM> make_kdms (
                std::list<boost::shared_ptr<Screen> >,
                boost::filesystem::path dcp,
-               boost::posix_time::ptime from,
-               boost::posix_time::ptime until
+               dcp::LocalTime from,
+               dcp::LocalTime until
                ) const;
 
        dcp::Key key () const {