Fix duplicate name of _mutex in ExceptionStore and some of its children.

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

diff --git a/src/lib/video_examiner.h b/src/lib/video_examiner.h
index 2dcacfc349fbeaa11b46219bf80867a6f682729e..66d3ae5b57ea2b056a9678ac737b660de38ee0c9 100644 (file)
--- a/src/lib/video_examiner.h
+++ b/src/lib/video_examiner.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -32,10 +32,10 @@ class VideoExaminer
 {
 public:
        virtual ~VideoExaminer () {}
-       virtual boost::optional<float> video_frame_rate () const = 0;
+       virtual boost::optional<double> video_frame_rate () const = 0;
        virtual dcp::Size video_size () const = 0;
-       virtual ContentTime video_length () const = 0;
-       virtual boost::optional<float> sample_aspect_ratio () const {
-               return boost::optional<float> ();
+       virtual Frame video_length () const = 0;
+       virtual boost::optional<double> sample_aspect_ratio () const {
+               return boost::optional<double> ();
        }
 };