X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=cbe6d7b6b397646765fdafb8cf9fa601d93f0549;hb=02f028d271677b3b3669b5cdfda1597108a34b80;hp=71bbd3844525e2f73e910fb629c23fc9763ce01c;hpb=6b35b4764ac5446c845a1dde9a01e0401862d835;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 71bbd3844..cbe6d7b6b 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -35,7 +35,8 @@ #include #include "util.h" #include "types.h" -#include "dci_metadata.h" +#include "isdcf_metadata.h" +#include "frame_rate_change.h" class DCPContentType; class Log; @@ -45,6 +46,7 @@ class Playlist; class AudioContent; class Scaler; class Screen; +class isdcf_name_test; /** @class Film * @@ -56,17 +58,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 audio_analysis_path (boost::shared_ptr) 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_dir () 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,13 +82,14 @@ 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 (); + std::list read_metadata (); void write_metadata () const; + boost::shared_ptr metadata () const; - std::string dci_name (bool if_created_now) const; + std::string isdcf_name (bool if_created_now) const; std::string dcp_name (bool if_created_now = false) const; /** @return true if our state has changed since we last saved it */ @@ -95,8 +98,9 @@ public: } libdcp::Size full_frame () const; + libdcp::Size frame_size () const; - bool have_dcp () const; + std::vector cpls () const; boost::shared_ptr make_player () const; boost::shared_ptr playlist () const; @@ -108,23 +112,28 @@ 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; + FrameRateChange active_frame_rate_change (Time) const; libdcp::KDM make_kdm ( boost::shared_ptr target, + boost::filesystem::path cpl_file, boost::posix_time::ptime from, boost::posix_time::ptime until ) const; std::list make_kdms ( std::list >, + boost::filesystem::path cpl_file, boost::posix_time::ptime from, boost::posix_time::ptime until ) const; @@ -133,23 +142,28 @@ public: return _key; } + int state_version () const { + return _state_version; + } + /** Identifiers for the parts of our state; used for signalling changes. */ enum Property { NONE, NAME, - USE_DCI_NAME, - /** The playlist's content list has changed (i.e. content has been added, moved around or removed) */ + USE_ISDCF_NAME, + /** The playlist's content list has changed (i.e. content has been added or removed) */ CONTENT, DCP_CONTENT_TYPE, CONTAINER, RESOLUTION, SCALER, WITH_SUBTITLES, + SIGNED, ENCRYPTED, J2K_BANDWIDTH, - DCI_METADATA, + ISDCF_METADATA, VIDEO_FRAME_RATE, AUDIO_CHANNELS, /** The setting of _three_d has been changed */ @@ -161,7 +175,7 @@ public: /* GET */ - std::string directory () const { + boost::filesystem::path directory () const { return _directory; } @@ -169,8 +183,8 @@ public: return _name; } - bool use_dci_name () const { - return _use_dci_name; + bool use_isdcf_name () const { + return _use_isdcf_name; } DCPContentType const * dcp_content_type () const { @@ -193,6 +207,11 @@ public: return _with_subtitles; } + /* signed is a reserved word */ + bool is_signed () const { + return _signed; + } + bool encrypted () const { return _encrypted; } @@ -201,8 +220,8 @@ public: return _j2k_bandwidth; } - DCIMetadata dci_metadata () const { - return _dci_metadata; + ISDCFMetadata isdcf_metadata () const { + return _isdcf_metadata; } /** @return The frame rate of the DCP */ @@ -229,9 +248,9 @@ 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 set_use_isdcf_name (bool); void examine_and_add_content (boost::shared_ptr); void add_content (boost::shared_ptr); void remove_content (boost::shared_ptr); @@ -242,13 +261,14 @@ public: 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); + void set_isdcf_metadata (ISDCFMetadata); void set_video_frame_rate (int); void set_audio_channels (int); void set_three_d (bool); - void set_dci_date_today (); + void set_isdcf_date_today (); void set_sequence_video (bool); void set_interop (bool); @@ -259,10 +279,12 @@ 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: + friend class ::isdcf_name_test; + void signal_changed (Property); std::string video_identifier () const; void playlist_changed (); @@ -277,12 +299,12 @@ 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; - /** True if a auto-generated DCI-compliant name should be used for our DCP */ - bool _use_dci_name; + /** True if a auto-generated ISDCF-compliant name should be used for our DCP */ + bool _use_isdcf_name; /** The type of content that this Film represents (feature, trailer etc.) */ DCPContentType const * _dcp_content_type; /** The container to put this Film in (flat, scope, etc.) */ @@ -293,15 +315,16 @@ 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; - /** DCI naming stuff */ - DCIMetadata _dci_metadata; + /** ISDCF naming stuff */ + ISDCFMetadata _isdcf_metadata; /** Frames per second to run our DCP at */ int _video_frame_rate; - /** The date that we should use in a DCI name */ - boost::gregorian::date _dci_date; + /** The date that we should use in a ISDCF name */ + boost::gregorian::date _isdcf_date; /** Number of audio channels to put in the DCP */ int _audio_channels; /** If true, the DCP will be written in 3D mode; otherwise in 2D. @@ -312,6 +335,8 @@ private: bool _interop; libdcp::Key _key; + int _state_version; + /** true if our state has changed since we last saved it */ mutable bool _dirty;