X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=4004421039e01a7c9cd1534e90588d2a3d89278e;hb=a9936a35fbae63311b1132e6283bf28db1d8c233;hp=f55d8182fe0f7dfffbf2c23b1606800d8bf03bcc;hpb=5ae794047e5ceee4502e59211f0083a60224f4bd;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index f55d8182f..400442103 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -30,7 +30,6 @@ #include "isdcf_metadata.h" #include "frame_rate_change.h" #include "signaller.h" -#include "ratio.h" #include #include #include @@ -40,6 +39,10 @@ #include #include +namespace xmlpp { + class Document; +} + class DCPContentType; class Log; class Content; @@ -47,6 +50,11 @@ class Player; class Playlist; class AudioContent; class Screen; +class AudioProcessor; +class AudioMapping; +class Ratio; +class Job; +class ScreenKDM; struct isdcf_name_test; /** @class Film @@ -62,11 +70,12 @@ public: Film (boost::filesystem::path, bool log = true); ~Film (); - boost::filesystem::path info_file () const; - boost::filesystem::path j2c_path (int, Eyes, bool) const; - boost::filesystem::path internal_video_mxf_dir () const; - boost::filesystem::path internal_video_mxf_filename () const; - boost::filesystem::path audio_analysis_dir () 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 (DCPTimePeriod p) const; + + boost::filesystem::path audio_analysis_path (boost::shared_ptr) const; void send_dcp_to_tms (); void make_dcp (); @@ -98,14 +107,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; @@ -121,8 +127,8 @@ public: 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, @@ -136,6 +142,17 @@ public: std::string subtitle_language () const; + void make_audio_mapping_default (AudioMapping & mapping) const; + std::vector audio_output_names () const; + + void repeat_content (ContentList, int); + + boost::shared_ptr playlist () const { + return _playlist; + } + + std::list reels () const; + /** Identifiers for the parts of our state; used for signalling changes. */ @@ -159,8 +176,9 @@ public: THREE_D, SEQUENCE_VIDEO, INTEROP, - /** The setting of _burn_subtitles has changed */ - BURN_SUBTITLES, + AUDIO_PROCESSOR, + REEL_TYPE, + REEL_LENGTH }; @@ -194,7 +212,7 @@ public: bool is_signed () const { return _signed; } - + bool encrypted () const { return _encrypted; } @@ -232,10 +250,17 @@ public: 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; } - /* SET */ @@ -246,6 +271,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 *); @@ -262,13 +288,15 @@ public: void set_isdcf_date_today (); void set_sequence_video (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); /** 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; @@ -280,9 +308,9 @@ 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_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; @@ -292,7 +320,7 @@ private: * must not be relative. */ boost::filesystem::path _directory; - + /** Name for DCP-o-matic */ std::string _name; /** True if a auto-generated ISDCF-compliant name should be used for our DCP */ @@ -305,6 +333,7 @@ private: Resolution _resolution; bool _signed; bool _encrypted; + dcp::Key _key; /** bandwidth for J2K files in bits per second */ int _j2k_bandwidth; /** ISDCF naming stuff */ @@ -313,7 +342,7 @@ private: int _video_frame_rate; /** The date that we should use in a ISDCF name */ boost::gregorian::date _isdcf_date; - /** Number of audio channels to put in the DCP */ + /** 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. @@ -321,8 +350,9 @@ private: bool _three_d; bool _sequence_video; bool _interop; - bool _burn_subtitles; - dcp::Key _key; + AudioProcessor const * _audio_processor; + ReelType _reel_type; + int64_t _reel_length; int _state_version; @@ -332,6 +362,7 @@ private: boost::signals2::scoped_connection _playlist_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;