X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdcp_examiner.h;h=fd643a754ff78cfa2caaa7bf80a332173810360f;hb=ec2f9869126bb5fa19c21e5272456976e7b7ad8a;hp=232d7f0d87ec2ceebade13de4422530af191c145;hpb=c78e9f0d5e802e1bb020694870357ef271217628;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 232d7f0d8..fd643a754 100644
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -34,7 +34,7 @@ class DCPContent;
 class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
 {
 public:
-	explicit DCPExaminer (boost::shared_ptr<const DCPContent>, bool tolerant);
+	explicit DCPExaminer (std::shared_ptr<const DCPContent>, bool tolerant);
 
 	bool has_video () const {
 		return _has_video;
@@ -59,7 +59,11 @@ public:
 	}
 
 	VideoRange range () const {
-		return VIDEO_RANGE_FULL;
+		return VideoRange::FULL;
+	}
+
+	PixelQuanta pixel_quanta () const {
+		return {};
 	}
 
 	std::string name () const {
@@ -90,11 +94,19 @@ public:
 		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.
 	 */
 	int text_count (TextType type) const {
-		return _text_count[type];
+		return _text_count[static_cast<int>(type)];
+	}
+
+	boost::optional<dcp::LanguageTag> open_subtitle_language () const {
+		return _open_subtitle_language;
 	}
 
 	DCPTextTrack dcp_text_track (int i) const {
@@ -153,31 +165,33 @@ public:
 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];
+	int _text_count[static_cast<int>(TextType::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;
+	bool _three_d = false;
 	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;
 };