X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.h;h=532bad60c54ba649f91b0958247e8c1474afc4d8;hp=5b510743b73c8ce8ba2a876c84e8fe5ae4d71b11;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=fc56dc97103d00437843a31e1ef0c4915900ad1a

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 5b510743b..532bad60c 100644
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  src/lib/dcp_examiner.h
+ *  @brief DCPExaminer class.
+ */
+
 #include "video_examiner.h"
 #include "audio_examiner.h"
 
@@ -26,16 +30,16 @@ class DCPExaminer : public VideoExaminer, public AudioExaminer
 {
 public:
 	DCPExaminer (boost::shared_ptr<const DCPContent>);
-	
-	float video_frame_rate () const {
-		return _video_frame_rate.get_value_or (24);
+
+	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));
 	}
-	
-	ContentTime video_length () const {
+
+	Frame video_length () const {
 		return _video_length;
 	}
 
@@ -47,25 +51,35 @@ public:
 		return _has_subtitles;
 	}
 
+	bool encrypted () const {
+		return _encrypted;
+	}
+
 	int audio_channels () const {
 		return _audio_channels.get_value_or (0);
 	}
-	
-	ContentTime audio_length () const {
+
+	Frame audio_length () const {
 		return _audio_length;
 	}
-	
+
 	int audio_frame_rate () const {
 		return _audio_frame_rate.get_value_or (48000);
 	}
 
+	bool kdm_valid () const {
+		return _kdm_valid;
+	}
+
 private:
-	boost::optional<float> _video_frame_rate;
+	boost::optional<double> _video_frame_rate;
 	boost::optional<dcp::Size> _video_size;
-	ContentTime _video_length;
+	Frame _video_length;
 	boost::optional<int> _audio_channels;
 	boost::optional<int> _audio_frame_rate;
-	ContentTime _audio_length;
+	Frame _audio_length;
 	std::string _name;
 	bool _has_subtitles;
+	bool _encrypted;
+	bool _kdm_valid;
 };