X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=d57c0059c753cdf621d1e9d11c7dbac02b25d82b;hb=b915348a8288d68e2ff114fb3dd89ad22e699969;hp=fedc43d6417f90c978281ee18b36c931d42ff558;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h index fedc43d64..d57c0059c 100644 --- a/src/lib/dcp_content.h +++ b/src/lib/dcp_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington + Copyright (C) 2014-2022 Carl Hetherington This file is part of DCP-o-matic. @@ -18,16 +18,21 @@ */ + #ifndef DCPOMATIC_DCP_CONTENT_H #define DCPOMATIC_DCP_CONTENT_H + /** @file src/lib/dcp_content.h * @brief DCPContent class. */ + #include "content.h" #include #include +#include + class DCPContentProperty { @@ -36,12 +41,12 @@ public: static int const NEEDS_ASSETS; static int const REFERENCE_VIDEO; static int const REFERENCE_AUDIO; - static int const REFERENCE_CAPTION; + static int const REFERENCE_TEXT; static int const NAME; - static int const CAPTIONS; + static int const TEXTS; + static int const CPL; }; -class ContentPart; /** @class DCPContent * @brief An existing DCP used as input. @@ -49,28 +54,29 @@ class ContentPart; class DCPContent : public Content { public: - DCPContent (boost::shared_ptr, boost::filesystem::path p); - DCPContent (boost::shared_ptr, cxml::ConstNodePtr, int version); + DCPContent (boost::filesystem::path p); + DCPContent (cxml::ConstNodePtr, int version); - boost::shared_ptr shared_from_this () { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () { + return std::dynamic_pointer_cast (Content::shared_from_this ()); } - boost::shared_ptr shared_from_this () const { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () const { + return std::dynamic_pointer_cast (Content::shared_from_this ()); } - DCPTime full_length () const; + dcpomatic::DCPTime full_length (std::shared_ptr film) const override; + dcpomatic::DCPTime approximate_length () const override; - void examine (boost::shared_ptr); - std::string summary () const; - std::string technical_summary () const; - void as_xml (xmlpp::Node *, bool with_paths) const; - std::string identifier () const; - void take_settings_from (boost::shared_ptr c); + void examine (std::shared_ptr film, std::shared_ptr) override; + std::string summary () const override; + std::string technical_summary () const override; + void as_xml (xmlpp::Node *, bool with_paths) const override; + std::string identifier () const override; + void take_settings_from (std::shared_ptr c) override; void set_default_colour_conversion (); - std::list reel_split_points () const; + std::list reel_split_points (std::shared_ptr film) const override; std::vector directories () const; @@ -97,7 +103,7 @@ public: return _reference_video; } - bool can_reference_video (std::string &) const; + bool can_reference_video (std::shared_ptr film, std::string &) const; void set_reference_audio (bool r); @@ -106,19 +112,19 @@ public: return _reference_audio; } - bool can_reference_audio (std::string &) const; + bool can_reference_audio (std::shared_ptr film, std::string &) const; - void set_reference_caption (TextType type, bool r); + void set_reference_text (TextType type, bool r); - /** @param type Original type of captions in the DCP. - * @return true if these captions are to be referenced. + /** @param type Original type of texts in the DCP. + * @return true if these texts are to be referenced. */ - bool reference_caption (TextType type) const { + bool reference_text (TextType type) const { boost::mutex::scoped_lock lm (_mutex); - return _reference_caption[type]; + return _reference_text[static_cast(type)]; } - bool can_reference_caption (TextType type, std::string &) const; + bool can_reference_text (std::shared_ptr film, TextType type, std::string &) const; void set_cpl (std::string id); @@ -137,15 +143,44 @@ public: return _three_d; } + boost::optional content_kind () const { + boost::mutex::scoped_lock lm (_mutex); + return _content_kind; + } + + dcp::Standard standard () const { + boost::mutex::scoped_lock lm (_mutex); + DCPOMATIC_ASSERT (_standard); + return _standard.get (); + } + + std::map markers () const { + return _markers; + } + + bool kdm_timing_window_valid () const; + + Resolution resolution () const; + + std::vector ratings () const { + return _ratings; + } + + std::vector content_versions () const { + return _content_versions; + } + private: - friend class reels_test5; + friend struct reels_test5; - void add_properties (std::list& p) const; + void add_properties (std::shared_ptr film, std::list& p) const override; void read_directory (boost::filesystem::path); - std::list reels () const; + void read_sub_directory (boost::filesystem::path); + std::list reels (std::shared_ptr film) const; bool can_reference ( - boost::function )>, + std::shared_ptr film, + std::function )>, std::string overlapping, std::string& why_not ) const; @@ -166,13 +201,14 @@ private: * rather than by rewrapping. */ bool _reference_audio; - /** true if the captions in this DCP should be included in the output by reference - * rather than by rewrapping. The types here are the original caption types, + /** true if the texts in this DCP should be included in the output by reference + * rather than by rewrapping. The types here are the original text types, * not what they are being used for. */ - bool _reference_caption[CAPTION_COUNT]; + bool _reference_text[static_cast(TextType::COUNT)]; boost::optional _standard; + boost::optional _content_kind; bool _three_d; /** ID of the CPL to use; older metadata might not specify this: in that case * just use the only CPL. @@ -180,6 +216,10 @@ private: boost::optional _cpl; /** List of the lengths of the reels in this DCP */ std::list _reel_lengths; + std::map _markers; + std::vector _ratings; + std::vector _content_versions; }; + #endif