X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=d251c7fcc3e6ddef4e70e729285b96323d8bd5e0;hp=1d8af39d81b043ee6a7f16b9fed8893f86ec9bb9;hb=75538d19688ad8c29c5949de9bff9f044c713936;hpb=988ed4fac88965f2fc260f55a05e2db87bb1ecb8 diff --git a/src/lib/film.h b/src/lib/film.h index 1d8af39d8..d251c7fcc 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -31,6 +31,7 @@ #include "isdcf_metadata.h" #include "frame_rate_change.h" #include "signaller.h" +#include "dcp_text_track.h" #include #include #include @@ -47,7 +48,6 @@ namespace xmlpp { class DCPContentType; class Log; class Content; -class Player; class Playlist; class AudioContent; class Screen; @@ -68,7 +68,7 @@ struct isdcf_name_test; class Film : public boost::enable_shared_from_this, public Signaller, public boost::noncopyable { public: - Film (boost::optional dir); + explicit Film (boost::optional dir); ~Film (); boost::filesystem::path info_file (DCPTimePeriod p) const; @@ -94,9 +94,12 @@ public: void use_template (std::string name); std::list read_metadata (boost::optional path = boost::optional ()); void write_metadata () const; + void write_metadata (boost::filesystem::path path) const; void write_template (boost::filesystem::path path) const; boost::shared_ptr metadata (bool with_content_paths = true) const; + void copy_from (boost::shared_ptr film); + std::string isdcf_name (bool if_created_now) const; std::string dcp_name (bool if_created_now = false) const; @@ -112,6 +115,8 @@ public: int audio_frame_rate () const; + std::list closed_caption_tracks () const; + uint64_t required_disk_space () const; bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const; @@ -121,6 +126,7 @@ public: DCPTime length () const; int best_video_frame_rate () const; FrameRateChange active_frame_rate_change (DCPTime) const; + std::pair speed_up_range (int dcp_frame_rate) const; dcp::EncryptedKDM make_kdm ( dcp::Certificate recipient, @@ -128,15 +134,19 @@ public: boost::filesystem::path cpl_file, dcp::LocalTime from, dcp::LocalTime until, - dcp::Formulation formulation + dcp::Formulation formulation, + bool disable_forensic_marking_picture, + boost::optional disable_forensic_marking_audio ) const; std::list make_kdms ( - std::list >, + std::list > screens, boost::filesystem::path cpl_file, boost::posix_time::ptime from, boost::posix_time::ptime until, - dcp::Formulation formulation + dcp::Formulation formulation, + bool disable_forensic_marking_picture, + boost::optional disable_forensic_marking_audio ) const; int state_version () const { @@ -161,12 +171,10 @@ public: std::list reels () const; std::list mapped_audio_channels () const; - /** @param A period within the DCP - * @return Name of the content which most contributes to the given period. - */ std::string content_summary (DCPTimePeriod period) const; - std::list fix_conflicting_settings (); + bool references_dcp_video () const; + bool references_dcp_audio () const; /** Identifiers for the parts of our state; used for signalling changes. @@ -196,7 +204,8 @@ public: AUDIO_PROCESSOR, REEL_TYPE, REEL_LENGTH, - UPLOAD_AFTER_MAKE_DCP + UPLOAD_AFTER_MAKE_DCP, + REENCODE_J2K }; @@ -288,13 +297,17 @@ public: return _context_id; } + bool reencode_j2k () const { + return _reencode_j2k; + } + /* SET */ void set_directory (boost::filesystem::path); void set_name (std::string); void set_use_isdcf_name (bool); - void examine_and_add_content (boost::shared_ptr); + void examine_and_add_content (boost::shared_ptr content, bool disable_audio_analysis = false); void add_content (boost::shared_ptr); void remove_content (boost::shared_ptr); void remove_content (ContentList); @@ -318,12 +331,13 @@ public: void set_reel_type (ReelType); void set_reel_length (int64_t); void set_upload_after_make_dcp (bool); + void set_reencode_j2k (bool); - /** Emitted when some property has of the Film has changed */ - mutable boost::signals2::signal Changed; + /** Emitted when some property has of the Film is about to change or has changed */ + mutable boost::signals2::signal Change; /** Emitted when some property of our content has changed */ - mutable boost::signals2::signal, int, bool)> ContentChanged; + mutable boost::signals2::signal, int, bool)> ContentChange; /** Current version number of the state file */ static int const current_state_version; @@ -331,15 +345,19 @@ public: private: friend struct ::isdcf_name_test; + template friend class ChangeSignaller; - void signal_changed (Property); + void signal_change (ChangeType, Property); + void signal_change (ChangeType, int); std::string video_identifier () const; - void playlist_changed (); + void playlist_change (ChangeType); void playlist_order_changed (); - void playlist_content_changed (boost::weak_ptr, int, bool frequent); - void maybe_add_content (boost::weak_ptr, boost::weak_ptr); + void playlist_content_change (ChangeType type, boost::weak_ptr, int, bool frequent); + void maybe_add_content (boost::weak_ptr, boost::weak_ptr, bool disable_audio_analysis); void audio_analysis_finished (); + static std::string const metadata_file; + /** Log to write to */ boost::shared_ptr _log; boost::shared_ptr _playlist; @@ -387,6 +405,7 @@ private: /** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */ int64_t _reel_length; bool _upload_after_make_dcp; + bool _reencode_j2k; int _state_version; @@ -395,9 +414,9 @@ private: /** film being used as a template, or 0 */ boost::shared_ptr _template_film; - boost::signals2::scoped_connection _playlist_changed_connection; + boost::signals2::scoped_connection _playlist_change_connection; boost::signals2::scoped_connection _playlist_order_changed_connection; - boost::signals2::scoped_connection _playlist_content_changed_connection; + boost::signals2::scoped_connection _playlist_content_change_connection; std::list _job_connections; std::list _audio_analysis_connections;