Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;

[dcpomatic.git] / src / lib / dcp_examiner.h

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 24a59dd342ebcbdd9bd4b142f7a9e6eddc8946fc..ef780dc3e9876d124493109315f5e1b3a9214bfd 100644 (file)
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -27,8 +27,8 @@ 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<float> video_frame_rate () const {
+               return _video_frame_rate;
        }
        
        dcp::Size video_size () const {
@@ -43,6 +43,14 @@ public:
                return _name;
        }
 
+       bool has_subtitles () const {
+               return _has_subtitles;
+       }
+
+       bool encrypted () const {
+               return _encrypted;
+       }
+
        int audio_channels () const {
                return _audio_channels.get_value_or (0);
        }
@@ -55,6 +63,10 @@ public:
                return _audio_frame_rate.get_value_or (48000);
        }
 
+       bool kdm_valid () const {
+               return _kdm_valid;
+       }
+
 private:
        boost::optional<float> _video_frame_rate;
        boost::optional<dcp::Size> _video_size;
@@ -63,4 +75,7 @@ private:
        boost::optional<int> _audio_frame_rate;
        ContentTime _audio_length;
        std::string _name;
+       bool _has_subtitles;
+       bool _encrypted;
+       bool _kdm_valid;
 };