X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Ffilm.h;h=355a41da531f4078aa23999b499e4efd17c615b0;hb=14cccb179fff7bbbf422e13f9d2e3264239c93c7;hp=2fb3e810b88739190fd0f3f071d2a9dbc29f74f2;hpb=a1839a88ab0cffdf04737dae783c21f27f65d491;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 2fb3e810b..355a41da5 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -46,7 +47,6 @@ namespace xmlpp { class DCPContentType; class Log; class Content; -class Player; class Playlist; class AudioContent; class Screen; @@ -67,7 +67,7 @@ struct isdcf_name_test; class Film : public boost::enable_shared_from_this, public Signaller, public boost::noncopyable { public: - Film (boost::filesystem::path, bool log = true); + Film (boost::optional dir); ~Film (); boost::filesystem::path info_file (DCPTimePeriod p) const; @@ -88,11 +88,15 @@ public: } boost::filesystem::path file (boost::filesystem::path f) const; - boost::filesystem::path dir (boost::filesystem::path d) const; + boost::filesystem::path dir (boost::filesystem::path d, bool create = true) const; - std::list read_metadata (); + void use_template (std::string name); + std::list read_metadata (boost::optional path = boost::optional ()); void write_metadata () const; - boost::shared_ptr metadata () 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; @@ -118,23 +122,27 @@ 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::EncryptedKDM make_kdm ( dcp::Certificate recipient, std::vector trusted_devices, 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, - dcp::LocalTime from, - dcp::LocalTime until, - dcp::Formulation formulation + boost::posix_time::ptime from, + boost::posix_time::ptime until, + dcp::Formulation formulation, + bool disable_forensic_marking_picture, + boost::optional disable_forensic_marking_audio ) const; int state_version () const { @@ -143,7 +151,11 @@ public: std::string subtitle_language () const; - void make_audio_mapping_default (AudioMapping & mapping) const; + void make_audio_mapping_default ( + AudioMapping & mapping, + boost::optional filename = boost::optional () + ) const; + std::vector audio_output_names () const; void repeat_content (ContentList, int); @@ -153,6 +165,12 @@ public: } std::list reels () const; + std::list mapped_audio_channels () const; + + std::string content_summary (DCPTimePeriod period) const; + + bool references_dcp_video () const; + bool references_dcp_audio () const; /** Identifiers for the parts of our state; used for signalling changes. @@ -177,17 +195,18 @@ public: AUDIO_CHANNELS, /** The setting of _three_d has changed */ THREE_D, - SEQUENCE_VIDEO, + SEQUENCE, INTEROP, AUDIO_PROCESSOR, REEL_TYPE, - REEL_LENGTH + REEL_LENGTH, + UPLOAD_AFTER_MAKE_DCP }; /* GET */ - boost::filesystem::path directory () const { + boost::optional directory () const { return _directory; } @@ -245,8 +264,8 @@ public: return _three_d; } - bool sequence_video () const { - return _sequence_video; + bool sequence () const { + return _sequence; } bool interop () const { @@ -265,13 +284,21 @@ public: return _reel_length; } + bool upload_after_make_dcp () const { + return _upload_after_make_dcp; + } + + std::string context_id () const { + return _context_id; + } + + /* SET */ void set_directory (boost::filesystem::path); void set_name (std::string); void set_use_isdcf_name (bool); - void examine_content (boost::shared_ptr); - 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); @@ -289,11 +316,12 @@ public: void set_audio_channels (int); void set_three_d (bool); void set_isdcf_date_today (); - void set_sequence_video (bool); + void set_sequence (bool); void set_interop (bool); void set_audio_processor (AudioProcessor const * processor); void set_reel_type (ReelType); void set_reel_length (int64_t); + void set_upload_after_make_dcp (bool); /** Emitted when some property has of the Film has changed */ mutable boost::signals2::signal Changed; @@ -313,9 +341,11 @@ private: void playlist_changed (); 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 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; @@ -323,7 +353,7 @@ private: /** Complete path to directory containing the film metadata; * must not be relative. */ - boost::filesystem::path _directory; + boost::optional _directory; /** Name for DCP-o-matic */ std::string _name; @@ -338,6 +368,10 @@ private: bool _signed; bool _encrypted; dcp::Key _key; + /** context ID used when encrypting picture assets; we keep it so that we can + * re-start picture MXF encodes. + */ + std::string _context_id; /** bandwidth for J2K files in bits per second */ int _j2k_bandwidth; /** ISDCF naming stuff */ @@ -352,17 +386,20 @@ private: This will be regardless of what content is on the playlist. */ bool _three_d; - bool _sequence_video; + bool _sequence; bool _interop; AudioProcessor const * _audio_processor; ReelType _reel_type; /** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */ int64_t _reel_length; + bool _upload_after_make_dcp; int _state_version; /** true if our state has changed since we last saved it */ mutable bool _dirty; + /** 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_order_changed_connection;