Merge master.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 4b07f84a928503befb9fd231ab2f4a0a8efd97e9..162b67b351bd6b9d0e2a97a6dc60e5b1e49387e1 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -56,14 +56,14 @@ class Screen;
 class Film : public boost::enable_shared_from_this<Film>, public boost::noncopyable
 {
 public:
-       Film (boost::filesystem::path);
+       Film (boost::filesystem::path, bool log = true);
 
        boost::filesystem::path info_dir () const;
        boost::filesystem::path j2c_path (int, Eyes, bool) const;
        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,8 +83,9 @@ 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;
 
        std::string dci_name (bool if_created_now) const;
        std::string dcp_name (bool if_created_now = false) const;
@@ -95,6 +96,7 @@ public:
        }
 
        libdcp::Size full_frame () const;
+       libdcp::Size frame_size () const;
 
        std::list<boost::filesystem::path> dcps () const;
 
@@ -108,13 +110,15 @@ public:
        Time video_frames_to_time (OutputVideoFrame) const;
        Time audio_frames_to_time (OutputAudioFrame) const;
 
+       uint64_t required_disk_space () const;
+       bool should_be_enough_disk_space (double &, double &) const;
+       
        /* Proxies for some Playlist methods */
 
        ContentList content () const;
        Time length () const;
        bool has_subtitles () const;
        OutputVideoFrame best_video_frame_rate () const;
-       bool content_paths_valid () const;
 
        libdcp::KDM
        make_kdm (
@@ -135,6 +139,10 @@ public:
                return _key;
        }
 
+       int state_version () const {
+               return _state_version;
+       }
+
        /** Identifiers for the parts of our state;
            used for signalling changes.
        */
@@ -268,7 +276,7 @@ public:
        mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
 
        /** Current version number of the state file */
-       static int const state_version;
+       static int const current_state_version;
 
 private:
 
@@ -322,6 +330,8 @@ private:
        bool _interop;
        libdcp::Key _key;
 
+       int _state_version;
+
        /** true if our state has changed since we last saved it */
        mutable bool _dirty;