X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=f776a3f72da22a440b8360128405f6384f523cab;hb=1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33;hp=01fccf7d177e197a344ffbf7354657c96fac54d3;hpb=5d398836a9b6acc2bbb536dabbd7bbc42a098659;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 01fccf7d1..f776a3f72 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include #include "util.h" #include "types.h" #include "dci_metadata.h" @@ -56,17 +56,17 @@ class Screen; class Film : public boost::enable_shared_from_this, public boost::noncopyable { public: - Film (boost::filesystem::path); + Film (boost::filesystem::path, bool log = true); - std::string info_dir () const; - std::string j2c_path (int, Eyes, bool) const; - std::string info_path (int, Eyes) const; - std::string internal_video_mxf_dir () const; - std::string internal_video_mxf_filename () const; + 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; - std::string video_mxf_filename () const; - std::string audio_mxf_filename () const; + boost::filesystem::path video_mxf_filename () const; + boost::filesystem::path audio_mxf_filename () const; void send_dcp_to_tms (); void make_dcp (); @@ -80,11 +80,12 @@ public: int encoded_frames () const; - std::string file (std::string f) const; - std::string dir (std::string d) const; + boost::filesystem::path file (boost::filesystem::path f) const; + boost::filesystem::path dir (boost::filesystem::path d) const; void read_metadata (); void write_metadata () const; + boost::shared_ptr metadata () const; std::string dci_name (bool if_created_now) const; std::string dcp_name (bool if_created_now = false) const; @@ -94,45 +95,49 @@ public: return _dirty; } - libdcp::Size full_frame () const; + dcp::Size full_frame () const; - bool have_dcp () const; + std::list dcps () const; boost::shared_ptr make_player () const; boost::shared_ptr 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; + /* 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 target, + boost::shared_ptr target, + boost::filesystem::path dcp, boost::posix_time::ptime from, boost::posix_time::ptime until ) const; - std::list make_kdms ( + std::list make_kdms ( std::list >, + 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; } + int state_version () const { + return _state_version; + } + /** Identifiers for the parts of our state; used for signalling changes. */ @@ -147,6 +152,7 @@ public: RESOLUTION, SCALER, WITH_SUBTITLES, + SIGNED, ENCRYPTED, J2K_BANDWIDTH, DCI_METADATA, @@ -161,7 +167,7 @@ public: /* GET */ - std::string directory () const { + boost::filesystem::path directory () const { return _directory; } @@ -193,6 +199,11 @@ public: return _with_subtitles; } + /* signed is a reserved word */ + bool is_signed () const { + return _signed; + } + bool encrypted () const { return _encrypted; } @@ -229,17 +240,20 @@ public: /* SET */ - void set_directory (std::string); + void set_directory (boost::filesystem::path); void set_name (std::string); void set_use_dci_name (bool); void examine_and_add_content (boost::shared_ptr); void add_content (boost::shared_ptr); void remove_content (boost::shared_ptr); + void move_content_earlier (boost::shared_ptr); + void move_content_later (boost::shared_ptr); void set_dcp_content_type (DCPContentType const *); void set_container (Ratio const *); void set_resolution (Resolution); void set_scaler (Scaler const *); void set_with_subtitles (bool); + void set_signed (bool); void set_encrypted (bool); void set_j2k_bandwidth (int); void set_dci_metadata (DCIMetadata); @@ -257,7 +271,7 @@ public: mutable boost::signals2::signal, int)> ContentChanged; /** Current version number of the state file */ - static int const state_version; + static int const current_state_version; private: @@ -275,7 +289,7 @@ private: /** Complete path to directory containing the film metadata; * must not be relative. */ - std::string _directory; + boost::filesystem::path _directory; /** Name for DCP-o-matic */ std::string _name; @@ -291,6 +305,7 @@ private: Scaler const * _scaler; /** True if subtitles should be shown for this film */ bool _with_subtitles; + bool _signed; bool _encrypted; /** bandwidth for J2K files in bits per second */ int _j2k_bandwidth; @@ -308,7 +323,9 @@ private: bool _three_d; bool _sequence_video; bool _interop; - libdcp::Key _key; + dcp::Key _key; + + int _state_version; /** true if our state has changed since we last saved it */ mutable bool _dirty;