X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=43a41ad45d5a43fbeaf92accdea2595e9155e6db;hb=d0e74dea9d189187d456173702a54a3b3c72aca0;hp=72d6d5e8d409bce8b2751e565c6fce1de789e751;hpb=e68386830c8812f80cb4b3af9871170226b916b4;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 72d6d5e8d..43a41ad45 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -31,8 +31,13 @@ #include "change_signaller.h" #include "dcp_text_track.h" +#include "dcpomatic_time.h" +#include "film_property.h" #include "frame_rate_change.h" +#include "named_channel.h" +#include "resolution.h" #include "signaller.h" +#include "territory_type.h" #include "transcode_job.h" #include "types.h" #include "util.h" @@ -41,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -58,18 +64,21 @@ namespace dcpomatic { class Screen; } +class AudioContent; +class AudioProcessor; +class Content; class DCPContentType; +class Film; +class Job; class Log; -class Content; class Playlist; -class AudioContent; -class AudioProcessor; class Ratio; -class Job; -class Film; +struct atmos_encrypted_passthrough_test; struct isdcf_name_test; +struct isdcf_name_with_atmos; +struct isdcf_name_with_ccap; +struct ov_subs_in_vf_name; struct recover_test_2d_encrypted; -struct atmos_encrypted_passthrough_test; class InfoFileHandle @@ -163,16 +172,7 @@ public: FrameRateChange active_frame_rate_change (dcpomatic::DCPTime) const; std::pair speed_up_range (int dcp_frame_rate) const; - 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, - bool disable_forensic_marking_picture, - boost::optional disable_forensic_marking_audio - ) const; + dcp::DecryptedKDM make_kdm(boost::filesystem::path cpl_file, dcp::LocalTime from, dcp::LocalTime until) const; int state_version () const { return _state_version; @@ -193,8 +193,12 @@ public: return _audio_language; } - /** @return pair containing the main subtitle language, and additional languages */ - std::pair, std::vector> subtitle_languages () const; + /** @param burnt_in If non-null, filled with true if all subtitles are burnt in, otherwise false. + * @return pair containing the main subtitle language, and additional languages + */ + std::pair, std::vector> subtitle_languages(bool* burnt_in = nullptr) const; + /** @return all closed caption languages in the film */ + std::vector closed_caption_languages() const; std::string content_summary (dcpomatic::DCPTimePeriod period) const; @@ -212,54 +216,6 @@ public: bool last_written_by_earlier_than(int major, int minor, int micro) const; - /** Identifiers for the parts of our state; - used for signalling changes. - */ - enum class Property { - NONE, - NAME, - 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, - ENCRYPTED, - J2K_BANDWIDTH, - VIDEO_FRAME_RATE, - AUDIO_FRAME_RATE, - AUDIO_CHANNELS, - /** The setting of _three_d has changed */ - THREE_D, - SEQUENCE, - INTEROP, - AUDIO_PROCESSOR, - REEL_TYPE, - REEL_LENGTH, - REENCODE_J2K, - MARKERS, - RATINGS, - CONTENT_VERSIONS, - NAME_LANGUAGE, - AUDIO_LANGUAGE, - RELEASE_TERRITORY, - SIGN_LANGUAGE_VIDEO_LANGUAGE, - VERSION_NUMBER, - STATUS, - CHAIN, - DISTRIBUTOR, - FACILITY, - STUDIO, - TEMP_VERSION, - PRE_RELEASE, - RED_BAND, - TWO_D_VERSION_OF_THREE_D, - LUMINANCE, - }; - - /* GET */ boost::optional directory () const { @@ -319,6 +275,10 @@ public: return _interop; } + bool limit_to_smpte_bv20() const { + return _limit_to_smpte_bv20; + } + AudioProcessor const * audio_processor () const { return _audio_processor; } @@ -358,6 +318,10 @@ public: return _name_language; } + TerritoryType territory_type() const { + return _territory_type; + } + boost::optional release_territory () const { return _release_territory; } @@ -440,6 +404,7 @@ public: void set_isdcf_date_today (); void set_sequence (bool); void set_interop (bool); + void set_limit_to_smpte_bv20(bool); void set_audio_processor (AudioProcessor const * processor); void set_reel_type (ReelType); void set_reel_length (int64_t); @@ -450,6 +415,7 @@ public: void set_ratings (std::vector r); void set_content_versions (std::vector v); void set_name_language (dcp::LanguageTag lang); + void set_territory_type(TerritoryType type); void set_release_territory (boost::optional region = boost::none); void set_sign_language_video_language (boost::optional tag); void set_version_number (int v); @@ -469,7 +435,7 @@ public: void add_ffoc_lfoc (Markers& markers) const; /** Emitted when some property has of the Film is about to change or has changed */ - mutable boost::signals2::signal Change; + mutable boost::signals2::signal Change; /** Emitted when some property of our content has changed */ mutable boost::signals2::signal, int, bool)> ContentChange; @@ -490,13 +456,16 @@ public: private: friend struct ::isdcf_name_test; + friend struct ::isdcf_name_with_atmos; + friend struct ::isdcf_name_with_ccap; friend struct ::recover_test_2d_encrypted; friend struct ::atmos_encrypted_passthrough_test; - template friend class ChangeSignaller; + friend struct ::ov_subs_in_vf_name; + template friend class ChangeSignalDespatcher; boost::filesystem::path info_file (dcpomatic::DCPTimePeriod p) const; - void signal_change (ChangeType, Property); + void signal_change (ChangeType, FilmProperty); void signal_change (ChangeType, int); std::string video_identifier () const; void playlist_change (ChangeType); @@ -550,6 +519,7 @@ private: bool _three_d; bool _sequence; bool _interop; + bool _limit_to_smpte_bv20; AudioProcessor const * _audio_processor; ReelType _reel_type; /** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */ @@ -563,6 +533,7 @@ private: std::vector _ratings; std::vector _content_versions; dcp::LanguageTag _name_language; + TerritoryType _territory_type = TerritoryType::SPECIFIC; boost::optional _release_territory; boost::optional _sign_language_video_language; int _version_number; @@ -605,7 +576,7 @@ private: }; -typedef ChangeSignaller FilmChangeSignaller; +typedef ChangeSignaller FilmChangeSignaller; #endif