Untested use of Frame for video/audio content lengths.

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

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 03d43d0f6c9f7a270ab2f2b16d147c4389ec289d..bf083e8ec68ce0844cdfe7c06f27aa162ae565e7 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,15 +31,15 @@ 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;
        }
 
@@ -55,7 +59,7 @@ public:
                return _audio_channels.get_value_or (0);
        }
        
-       ContentTime audio_length () const {
+       Frame audio_length () const {
                return _audio_length;
        }
        
@@ -70,10 +74,10 @@ public:
 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;
-       ContentTime _audio_length;
+       Frame _audio_length;
        std::string _name;
        bool _has_subtitles;
        bool _encrypted;