X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.h;h=f54f02c36c005f607de6b8b3720beac8b4a3f2df;hb=bd68f5a27795cb9151633bac810c53bae4ec4bf4;hp=aaeec6d3249c6405bee61bda579527ddbf367105;hpb=a69d242f3f00207d6ea7320e6723775f4b0dbfb3;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index aaeec6d32..f54f02c36 100644
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -33,12 +33,18 @@ class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
 public:
 	explicit DCPExaminer (boost::shared_ptr<const DCPContent>);
 
+	bool has_video () const {
+		return _has_video;
+	}
+
 	boost::optional<double> video_frame_rate () const {
 		return _video_frame_rate;
 	}
 
 	dcp::Size video_size () const {
-		return _video_size.get_value_or (dcp::Size (1998, 1080));
+		DCPOMATIC_ASSERT (_has_video);
+		DCPOMATIC_ASSERT (_video_size);
+		return *_video_size;
 	}
 
 	Frame video_length () const {
@@ -53,10 +59,6 @@ public:
 		return _name;
 	}
 
-	bool has_subtitles () const {
-		return _has_subtitles;
-	}
-
 	bool encrypted () const {
 		return _encrypted;
 	}
@@ -65,6 +67,10 @@ public:
 		return _needs_assets;
 	}
 
+	bool has_audio () const {
+		return _has_audio;
+	}
+
 	int audio_channels () const {
 		return _audio_channels.get_value_or (0);
 	}
@@ -77,6 +83,10 @@ public:
 		return _audio_frame_rate.get_value_or (48000);
 	}
 
+	bool has_text (TextType type) const {
+		return _has_text[type];
+	}
+
 	bool kdm_valid () const {
 		return _kdm_valid;
 	}
@@ -89,6 +99,10 @@ public:
 		return _three_d;
 	}
 
+	dcp::ContentKind content_kind () const {
+		return _content_kind;
+	}
+
 	std::string cpl () const {
 		return _cpl;
 	}
@@ -105,12 +119,17 @@ private:
 	boost::optional<int> _audio_frame_rate;
 	Frame _audio_length;
 	std::string _name;
-	bool _has_subtitles;
+	/** true if this DCP has video content (but false if it has unresolved references to video content) */
+	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_text[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;
 };