X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=5fa35b0653d67b46d1bd9845eb86d33b61ad8b19;hb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;hp=a1daebe783f854d5e422a44bbc6dad47985cd0f2;hpb=d71b3fffa09263a2116b3f91981c1999b4ae873c;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index a1daebe78..5fa35b065 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 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 . */ @@ -30,7 +31,6 @@ #include "isdcf_metadata.h" #include "frame_rate_change.h" #include "signaller.h" -#include "ratio.h" #include #include #include @@ -40,6 +40,10 @@ #include #include +namespace xmlpp { + class Document; +} + class DCPContentType; class Log; class Content; @@ -49,6 +53,9 @@ class AudioContent; class Screen; class AudioProcessor; class AudioMapping; +class Ratio; +class Job; +class ScreenKDM; struct isdcf_name_test; /** @class Film @@ -61,13 +68,13 @@ 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 () const; - boost::filesystem::path j2c_path (int, Eyes, bool) const; + boost::filesystem::path info_file (DCPTimePeriod p) const; + boost::filesystem::path j2c_path (int, Frame, Eyes, bool) const; boost::filesystem::path internal_video_asset_dir () const; - boost::filesystem::path internal_video_asset_filename () const; + boost::filesystem::path internal_video_asset_filename (DCPTimePeriod p) const; boost::filesystem::path audio_analysis_path (boost::shared_ptr) const; @@ -84,9 +91,11 @@ public: boost::filesystem::path file (boost::filesystem::path f) const; boost::filesystem::path dir (boost::filesystem::path d) 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; std::string isdcf_name (bool if_created_now) const; std::string dcp_name (bool if_created_now = false) const; @@ -101,14 +110,11 @@ public: std::vector cpls () const; - boost::shared_ptr make_player () const; - boost::shared_ptr playlist () const; - int audio_frame_rate () const; uint64_t required_disk_space () const; bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const; - + /* Proxies for some Playlist methods */ ContentList content () const; @@ -116,20 +122,20 @@ public: int best_video_frame_rate () const; FrameRateChange active_frame_rate_change (DCPTime) const; - dcp::EncryptedKDM - make_kdm ( - dcp::Certificate target, + 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 ) const; - - std::list make_kdms ( + + std::list make_kdms ( std::list >, boost::filesystem::path cpl_file, - dcp::LocalTime from, - dcp::LocalTime until, + boost::posix_time::ptime from, + boost::posix_time::ptime until, dcp::Formulation formulation ) const; @@ -139,9 +145,29 @@ 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); + + boost::shared_ptr playlist () const { + return _playlist; + } + + 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 (); + /** Identifiers for the parts of our state; used for signalling changes. */ @@ -151,6 +177,8 @@ public: USE_ISDCF_NAME, /** The playlist's content list has changed (i.e. content has been added or removed) */ CONTENT, + /** The order of content in the playlist has changed */ + CONTENT_ORDER, DCP_CONTENT_TYPE, CONTAINER, RESOLUTION, @@ -163,17 +191,18 @@ public: AUDIO_CHANNELS, /** The setting of _three_d has changed */ THREE_D, - SEQUENCE_VIDEO, + SEQUENCE, INTEROP, - /** The setting of _burn_subtitles has changed */ - BURN_SUBTITLES, AUDIO_PROCESSOR, + REEL_TYPE, + REEL_LENGTH, + UPLOAD_AFTER_MAKE_DCP }; /* GET */ - boost::filesystem::path directory () const { + boost::optional directory () const { return _directory; } @@ -201,7 +230,7 @@ public: bool is_signed () const { return _signed; } - + bool encrypted () const { return _encrypted; } @@ -223,28 +252,37 @@ public: return _video_frame_rate; } - int audio_channels () const; + int audio_channels () const { + return _audio_channels; + } bool three_d () const { return _three_d; } - bool sequence_video () const { - return _sequence_video; + bool sequence () const { + return _sequence; } bool interop () const { return _interop; } - bool burn_subtitles () const { - return _burn_subtitles; - } - AudioProcessor const * audio_processor () const { return _audio_processor; } - + + ReelType reel_type () const { + return _reel_type; + } + + int64_t reel_length () const { + return _reel_length; + } + + bool upload_after_make_dcp () const { + return _upload_after_make_dcp; + } /* SET */ @@ -255,6 +293,7 @@ public: void examine_and_add_content (boost::shared_ptr); void add_content (boost::shared_ptr); void remove_content (boost::shared_ptr); + void remove_content (ContentList); void move_content_earlier (boost::shared_ptr); void move_content_later (boost::shared_ptr); void set_dcp_content_type (DCPContentType const *); @@ -269,16 +308,18 @@ 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_burn_subtitles (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; /** Emitted when some property of our content has changed */ - mutable boost::signals2::signal, int)> ContentChanged; + mutable boost::signals2::signal, int, bool)> ContentChanged; /** Current version number of the state file */ static int const current_state_version; @@ -290,9 +331,10 @@ private: void signal_changed (Property); std::string video_identifier () const; void playlist_changed (); - void playlist_content_changed (boost::weak_ptr, int); - std::string filename_safe_name () const; + 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 audio_analysis_finished (); /** Log to write to */ boost::shared_ptr _log; @@ -301,8 +343,8 @@ 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; /** True if a auto-generated ISDCF-compliant name should be used for our DCP */ @@ -324,27 +366,32 @@ private: int _video_frame_rate; /** The date that we should use in a ISDCF name */ boost::gregorian::date _isdcf_date; - /** Number of audio channels requested for the DCP; this will be overridden - if we are using an audio processor which outputs more channels. - */ + /** Number of audio channels requested for the DCP */ int _audio_channels; /** If true, the DCP will be written in 3D mode; otherwise in 2D. This will be regardless of what content is on the playlist. */ bool _three_d; - bool _sequence_video; + bool _sequence; bool _interop; - bool _burn_subtitles; 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; boost::signals2::scoped_connection _playlist_content_changed_connection; std::list _job_connections; + std::list _audio_analysis_connections; friend struct paths_test; friend struct film_metadata_test;