Fix audio analysis; make sure we don't decode video and let it pile up unwanted.

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

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 5b510743b73c8ce8ba2a876c84e8fe5ae4d71b11..26957b3e45b2ba31a1edc2e9ca5a82c2141cc445 100644 (file)
--- 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"
 
@@ -27,8 +31,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 {
@@ -47,6 +51,10 @@ public:
                return _has_subtitles;
        }
 
+       bool encrypted () const {
+               return _encrypted;
+       }
+
        int audio_channels () const {
                return _audio_channels.get_value_or (0);
        }
@@ -59,6 +67,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;
@@ -68,4 +80,6 @@ private:
        ContentTime _audio_length;
        std::string _name;
        bool _has_subtitles;
+       bool _encrypted;
+       bool _kdm_valid;
 };