X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.h;h=75ea8b68c664176d8aa6072063c272fee74e1da7;hb=323b8cbb0b95297fbd027ffdc4ea5003b59ef25f;hp=f577e2b3552c999a1f5f0b3e681fbafe4c785248;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index f577e2b35..75ea8b68c 100644
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -18,48 +18,56 @@
 
 */
 
+
 /** @file  src/lib/dcp_examiner.h
  *  @brief DCPExaminer class.
  */
 
-#include "video_examiner.h"
+
 #include "audio_examiner.h"
-#include "dcp.h"
 #include "dcp_text_track.h"
 #include "dcpomatic_assert.h"
+#include "video_examiner.h"
 #include <dcp/dcp_time.h>
+#include <dcp/rating.h>
+
 
 class DCPContent;
 
-class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
+
+class DCPExaminer : public VideoExaminer, public AudioExaminer
 {
 public:
 	explicit DCPExaminer (std::shared_ptr<const DCPContent>, bool tolerant);
 
-	bool has_video () const {
+	bool has_video () const override {
 		return _has_video;
 	}
 
-	boost::optional<double> video_frame_rate () const {
+	boost::optional<double> video_frame_rate () const override {
 		return _video_frame_rate;
 	}
 
-	dcp::Size video_size () const {
+	dcp::Size video_size () const override {
 		DCPOMATIC_ASSERT (_has_video);
 		DCPOMATIC_ASSERT (_video_size);
 		return *_video_size;
 	}
 
-	Frame video_length () const {
+	Frame video_length () const override {
 		return _video_length;
 	}
 
-	bool yuv () const {
+	bool yuv () const override {
 		return false;
 	}
 
-	VideoRange range () const {
-		return VIDEO_RANGE_FULL;
+	VideoRange range () const override {
+		return VideoRange::FULL;
+	}
+
+	PixelQuanta pixel_quanta () const override {
+		return {};
 	}
 
 	std::string name () const {
@@ -74,22 +82,26 @@ public:
 		return _needs_assets;
 	}
 
-	bool has_audio () const {
+	bool has_audio () const override {
 		return _has_audio;
 	}
 
-	int audio_channels () const {
+	int audio_channels () const override {
 		return _audio_channels.get_value_or (0);
 	}
 
-	Frame audio_length () const {
+	Frame audio_length () const override {
 		return _audio_length;
 	}
 
-	int audio_frame_rate () const {
+	int audio_frame_rate () const override {
 		return _audio_frame_rate.get_value_or (48000);
 	}
 
+	boost::optional<dcp::LanguageTag> audio_language () const {
+		return _audio_language;
+	}
+
 	/** @param type TEXT_OPEN_SUBTITLE or TEXT_CLOSED_CAPTION.
 	 *  @return Number of assets of this type in this DCP.
 	 */
@@ -97,6 +109,10 @@ public:
 		return _text_count[type];
 	}
 
+	boost::optional<dcp::LanguageTag> open_subtitle_language () const {
+		return _open_subtitle_language;
+	}
+
 	DCPTextTrack dcp_text_track (int i) const {
 		DCPOMATIC_ASSERT (i >= 0 && i < static_cast<int>(_dcp_text_tracks.size()));
 		return _dcp_text_tracks[i];
@@ -115,7 +131,8 @@ public:
 	}
 
 	dcp::ContentKind content_kind () const {
-		return _content_kind;
+		DCPOMATIC_ASSERT(_content_kind);
+		return *_content_kind;
 	}
 
 	std::string cpl () const {
@@ -150,34 +167,42 @@ public:
 		return _atmos_edit_rate;
 	}
 
+	/** @return fonts in each reel */
+	std::vector<std::vector<std::shared_ptr<dcpomatic::Font>>> fonts() const {
+		return _fonts;
+	}
+
 private:
 	boost::optional<double> _video_frame_rate;
 	boost::optional<dcp::Size> _video_size;
-	Frame _video_length;
+	Frame _video_length = 0;
 	boost::optional<int> _audio_channels;
 	boost::optional<int> _audio_frame_rate;
-	Frame _audio_length;
+	Frame _audio_length = 0;
 	std::string _name;
 	/** true if this DCP has video content (but false if it has unresolved references to video content) */
-	bool _has_video;
+	bool _has_video = false;
 	/** true if this DCP has audio content (but false if it has unresolved references to audio content) */
-	bool _has_audio;
+	bool _has_audio = false;
+	boost::optional<dcp::LanguageTag> _audio_language;
 	/** number of different assets of each type (OCAP/CCAP) */
-	int _text_count[TEXT_COUNT];
+	EnumIndexedVector<int, TextType> _text_count;
+	boost::optional<dcp::LanguageTag> _open_subtitle_language;
 	/** the DCPTextTracks for each of our CCAPs */
 	std::vector<DCPTextTrack> _dcp_text_tracks;
-	bool _encrypted;
-	bool _needs_assets;
-	bool _kdm_valid;
+	bool _encrypted = false;
+	bool _needs_assets = false;
+	bool _kdm_valid = false;
 	boost::optional<dcp::Standard> _standard;
-	bool _three_d;
-	dcp::ContentKind _content_kind;
+	bool _three_d = false;
+	boost::optional<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::vector<std::string> _content_versions;
-	bool _has_atmos;
-	Frame _atmos_length;
+	bool _has_atmos = false;
+	Frame _atmos_length = 0;
 	dcp::Fraction _atmos_edit_rate;
+	std::vector<std::vector<std::shared_ptr<dcpomatic::Font>>> _fonts;
 };