X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=96a79f9cf5abfd6179922da03e376e0a2aac472c;hb=20eea989f452ea1a6af0af6b5c5b504d3b19480c;hp=b7d105688d06c2a1bf644544fb43aff9e9fd9c37;hpb=075f418cc6d9be06bed7a1d98257ae8d17ef3019;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index b7d105688..96a79f9cf 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,18 +25,20 @@ #ifndef DCPOMATIC_FILM_H #define DCPOMATIC_FILM_H -#include -#include -#include -#include -#include -#include -#include -#include #include "util.h" #include "types.h" #include "isdcf_metadata.h" #include "frame_rate_change.h" +#include "signaller.h" +#include "ratio.h" +#include +#include +#include +#include +#include +#include +#include +#include class DCPContentType; class Log; @@ -44,9 +46,10 @@ class Content; class Player; class Playlist; class AudioContent; -class Scaler; class Screen; -class isdcf_name_test; +class AudioProcessor; +class AudioMapping; +struct isdcf_name_test; /** @class Film * @@ -55,20 +58,18 @@ class isdcf_name_test; * * The content of a Film is held in a Playlist (created and managed by the Film). */ -class Film : public boost::enable_shared_from_this, public boost::noncopyable +class Film : public boost::enable_shared_from_this, public Signaller, public boost::noncopyable { public: Film (boost::filesystem::path, bool log = true); + ~Film (); - boost::filesystem::path info_dir () const; + boost::filesystem::path info_file () 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; + boost::filesystem::path internal_video_asset_dir () const; + boost::filesystem::path internal_video_asset_filename () const; - boost::filesystem::path video_mxf_filename () const; - boost::filesystem::path audio_mxf_filename () const; + boost::filesystem::path audio_analysis_path (boost::shared_ptr) const; void send_dcp_to_tms (); void make_dcp (); @@ -80,8 +81,6 @@ public: return _log; } - int encoded_frames () const; - boost::filesystem::path file (boost::filesystem::path f) const; boost::filesystem::path dir (boost::filesystem::path d) const; @@ -97,57 +96,52 @@ public: return _dirty; } - libdcp::Size full_frame () const; - libdcp::Size frame_size () const; + dcp::Size full_frame () const; + dcp::Size frame_size () const; std::vector cpls () const; boost::shared_ptr make_player () const; boost::shared_ptr playlist () const; - OutputAudioFrame audio_frame_rate () const; - - OutputAudioFrame time_to_audio_frames (Time) const; - OutputVideoFrame time_to_video_frames (Time) const; - Time video_frames_to_time (OutputVideoFrame) const; - Time audio_frames_to_time (OutputAudioFrame) const; + int audio_frame_rate () const; uint64_t required_disk_space () const; - bool should_be_enough_disk_space (double &, double &) const; + bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) 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; + DCPTime length () const; + int best_video_frame_rate () const; + FrameRateChange active_frame_rate_change (DCPTime) const; - libdcp::KDM + dcp::EncryptedKDM make_kdm ( - boost::shared_ptr target, + dcp::Certificate target, boost::filesystem::path cpl_file, - boost::posix_time::ptime from, - boost::posix_time::ptime until, - libdcp::KDM::Formulation formulation + 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, - boost::posix_time::ptime from, - boost::posix_time::ptime until, - libdcp::KDM::Formulation formulation + dcp::LocalTime from, + dcp::LocalTime until, + dcp::Formulation formulation ) const; - libdcp::Key key () const { - return _key; - } - int state_version () const { return _state_version; } + std::string subtitle_language () const; + + void make_audio_mapping_default (AudioMapping & mapping) const; + std::vector audio_output_names () const; + /** Identifiers for the parts of our state; used for signalling changes. */ @@ -160,18 +154,20 @@ public: DCP_CONTENT_TYPE, CONTAINER, RESOLUTION, - SCALER, - WITH_SUBTITLES, SIGNED, ENCRYPTED, + KEY, J2K_BANDWIDTH, ISDCF_METADATA, VIDEO_FRAME_RATE, AUDIO_CHANNELS, - /** The setting of _three_d has been changed */ + /** The setting of _three_d has changed */ THREE_D, SEQUENCE_VIDEO, INTEROP, + /** The setting of _burn_subtitles has changed */ + BURN_SUBTITLES, + AUDIO_PROCESSOR, }; @@ -201,14 +197,6 @@ public: return _resolution; } - Scaler const * scaler () const { - return _scaler; - } - - bool with_subtitles () const { - return _with_subtitles; - } - /* signed is a reserved word */ bool is_signed () const { return _signed; @@ -218,6 +206,10 @@ public: return _encrypted; } + dcp::Key key () const { + return _key; + } + int j2k_bandwidth () const { return _j2k_bandwidth; } @@ -246,6 +238,14 @@ public: bool interop () const { return _interop; } + + bool burn_subtitles () const { + return _burn_subtitles; + } + + AudioProcessor const * audio_processor () const { + return _audio_processor; + } /* SET */ @@ -253,6 +253,7 @@ public: 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 add_content (boost::shared_ptr); void remove_content (boost::shared_ptr); @@ -261,10 +262,9 @@ public: void set_dcp_content_type (DCPContentType const *); void set_container (Ratio const *); void set_resolution (Resolution); - void set_scaler (Scaler const *); - void set_with_subtitles (bool); void set_signed (bool); void set_encrypted (bool); + void set_key (dcp::Key key); void set_j2k_bandwidth (int); void set_isdcf_metadata (ISDCFMetadata); void set_video_frame_rate (int); @@ -273,6 +273,8 @@ 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); /** Emitted when some property has of the Film has changed */ mutable boost::signals2::signal Changed; @@ -285,7 +287,7 @@ public: private: - friend class ::isdcf_name_test; + friend struct ::isdcf_name_test; void signal_changed (Property); std::string video_identifier () const; @@ -313,12 +315,9 @@ private: Ratio const * _container; /** DCP resolution (2K or 4K) */ Resolution _resolution; - /** Scaler algorithm to use */ - Scaler const * _scaler; - /** True if subtitles should be shown for this film */ - bool _with_subtitles; bool _signed; bool _encrypted; + dcp::Key _key; /** bandwidth for J2K files in bits per second */ int _j2k_bandwidth; /** ISDCF naming stuff */ @@ -327,7 +326,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. @@ -335,15 +334,20 @@ private: bool _three_d; bool _sequence_video; bool _interop; - libdcp::Key _key; + bool _burn_subtitles; + AudioProcessor const * _audio_processor; int _state_version; /** true if our state has changed since we last saved it */ mutable bool _dirty; - friend class paths_test; - friend class film_metadata_test; + boost::signals2::scoped_connection _playlist_changed_connection; + boost::signals2::scoped_connection _playlist_content_changed_connection; + std::list _job_connections; + + friend struct paths_test; + friend struct film_metadata_test; }; #endif