X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.h;h=e52234e360fde46d827c6238abc6407c25810b3b;hp=16385e07a66662149e27e39653938f32136cab97;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=dea824f6ff41384a5e17e23de5434cf84eccff29 diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h index 16385e07a..e52234e36 100644 --- a/src/lib/dcp_examiner.h +++ b/src/lib/dcp_examiner.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -31,7 +31,7 @@ class DCPContent; class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer { public: - explicit DCPExaminer (boost::shared_ptr); + explicit DCPExaminer (boost::shared_ptr, bool tolerant); bool has_video () const { return _has_video; @@ -55,6 +55,10 @@ public: return false; } + VideoRange range () const { + return VIDEO_RANGE_FULL; + } + std::string name () const { return _name; } @@ -83,8 +87,11 @@ public: return _audio_frame_rate.get_value_or (48000); } - bool has_caption (CaptionType type) const { - return _has_caption[type]; + /** @param type TEXT_OPEN_SUBTITLE or TEXT_CLOSED_CAPTION. + * @return Number of assets of this type in this DCP. + */ + int text_count (TextType type) const { + return _text_count[type]; } bool kdm_valid () const { @@ -99,6 +106,10 @@ public: return _three_d; } + dcp::ContentKind content_kind () const { + return _content_kind; + } + std::string cpl () const { return _cpl; } @@ -119,12 +130,14 @@ private: bool _has_video; /** true if this DCP has audio content (but false if it has unresolved references to audio content) */ bool _has_audio; - bool _has_caption[CAPTION_COUNT]; + /** number of different assets of each type (OCAP/CCAP) */ + int _text_count[TEXT_COUNT]; bool _encrypted; bool _needs_assets; bool _kdm_valid; boost::optional _standard; bool _three_d; + dcp::ContentKind _content_kind; std::string _cpl; std::list _reel_lengths; };