X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.h;h=21aa8d3ab58537de5c4446f899f94d4bcc4bb459;hb=48841aa4a4aa4704e1e054b294bac23996be6dd0;hp=29fcc48d2c1962f7c93db0c440dcb38ba7b0c41a;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 29fcc48d2..21aa8d3ab 100644
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,13 +25,14 @@
 #include "video_examiner.h"
 #include "audio_examiner.h"
 #include "dcp.h"
+#include <dcp/dcp_time.h>
 
 class DCPContent;
 
 class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
 {
 public:
-	explicit DCPExaminer (boost::shared_ptr<const DCPContent>);
+	explicit DCPExaminer (boost::shared_ptr<const DCPContent>, bool tolerant);
 
 	bool has_video () const {
 		return _has_video;
@@ -55,6 +56,10 @@ public:
 		return false;
 	}
 
+	VideoRange range () const {
+		return VIDEO_RANGE_FULL;
+	}
+
 	std::string name () const {
 		return _name;
 	}
@@ -83,8 +88,11 @@ public:
 		return _audio_frame_rate.get_value_or (48000);
 	}
 
-	bool has_caption (TextType 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 +107,10 @@ public:
 		return _three_d;
 	}
 
+	dcp::ContentKind content_kind () const {
+		return _content_kind;
+	}
+
 	std::string cpl () const {
 		return _cpl;
 	}
@@ -107,6 +119,18 @@ public:
 		return _reel_lengths;
 	}
 
+	std::map<dcp::Marker, dcp::Time> markers () const {
+		return _markers;
+	}
+
+	std::vector<dcp::Rating> ratings () const {
+		return _ratings;
+	}
+
+	std::string content_version () const {
+		return _content_version;
+	}
+
 private:
 	boost::optional<double> _video_frame_rate;
 	boost::optional<dcp::Size> _video_size;
@@ -119,12 +143,17 @@ 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<dcp::Standard> _standard;
 	bool _three_d;
+	dcp::ContentKind _content_kind;
 	std::string _cpl;
 	std::list<int64_t> _reel_lengths;
+	std::map<dcp::Marker, dcp::Time> _markers;
+	std::vector<dcp::Rating> _ratings;
+	std::string _content_version;
 };