Another try at sorting out the thorny question of timing.

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

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 57b7775d4b84942c8aa065e891e8da230dcd5179..ec84865ed7cce45fdcc40999e5bb4f197fb55ce2 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -31,7 +31,7 @@ public:
        
        float video_frame_rate () const;
        libdcp::Size video_size () const;
-       ContentVideoFrame video_length () const;
+       VideoContent::Frame video_length () const;
 
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
                return _subtitle_streams;
@@ -41,15 +41,15 @@ public:
                return _audio_streams;
        }
 
-       boost::optional<Time> first_video () const {
+       boost::optional<double> first_video () const {
                return _first_video;
        }
        
 private:
        std::string stream_name (AVStream* s) const;
-       boost::optional<Time> frame_time (int) const;
+       boost::optional<double> frame_time (int) const;
        
         std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
         std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
-       boost::optional<Time> _first_video;
+       boost::optional<double> _first_video;
 };