No-op: remove all trailing whitespace.

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

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index c8b0ef7da37073b07f4f31abc8b14ee85674753b..ed457b5c246835a8243569071d1559bb10547b72 100644 (file)
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -17,31 +17,69 @@
 
 */
 
+/** @file  src/lib/dcp_examiner.h
+ *  @brief DCPExaminer class.
+ */
+
 #include "video_examiner.h"
+#include "audio_examiner.h"
 
 class DCPContent;
 
-class DCPExaminer : public VideoExaminer
+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 {
                return _video_size.get_value_or (dcp::Size (1998, 1080));
        }
-       
-       ContentTime video_length () const {
+
+       Frame video_length () const {
                return _video_length;
        }
 
+       std::string name () const {
+               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);
+       }
+
+       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<dcp::Size> _video_size;
-       ContentTime _video_length;
+       Frame _video_length;
        boost::optional<int> _audio_channels;
        boost::optional<int> _audio_frame_rate;
+       Frame _audio_length;
+       std::string _name;
+       bool _has_subtitles;
+       bool _encrypted;
+       bool _kdm_valid;
 };