float -> double in a few places.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 9e5c1362f94d73edfbe1d5d5492ad7354fbac5b1..fdd27498514e5cc95af219b059db0c6b812c63d6 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -44,27 +44,28 @@ class VideoContent : public virtual Content
 {
 public:
        VideoContent (boost::shared_ptr<const Film>);
-       VideoContent (boost::shared_ptr<const Film>, DCPTime, ContentTime);
+       VideoContent (boost::shared_ptr<const Film>, DCPTime, Frame);
        VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
        VideoContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
        VideoContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
        void as_xml (xmlpp::Node *) const;
        std::string technical_summary () const;
-       virtual std::string information () const;
        virtual std::string identifier () const;
 
-       ContentTime video_length () const {
+       virtual void set_default_colour_conversion ();
+
+       Frame video_length () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_length;
        }
 
-       ContentTime video_length_after_3d_combine () const {
+       Frame video_length_after_3d_combine () const {
                boost::mutex::scoped_lock lm (_mutex);
                if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
-                       return ContentTime (_video_length.get() / 2);
+                       return _video_length / 2;
                }
-               
+
                return _video_length;
        }
 
@@ -72,14 +73,14 @@ public:
                boost::mutex::scoped_lock lm (_mutex);
                return _video_size;
        }
-       
-       float video_frame_rate () const {
+
+       double video_frame_rate () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_frame_rate;
        }
 
        void set_video_frame_type (VideoFrameType);
-       void set_video_frame_rate (float);
+       void set_video_frame_rate (double);
 
        void set_left_crop (int);
        void set_right_crop (int);
@@ -87,13 +88,12 @@ public:
        void set_bottom_crop (int);
 
        void set_scale (VideoContentScale);
-       void unset_colour_conversion ();
+       void unset_colour_conversion (bool signal = true);
        void set_colour_conversion (ColourConversion);
-       void set_default_colour_conversion (bool signal = true);
 
-       void set_fade_in (ContentTime);
-       void set_fade_out (ContentTime);
-       
+       void set_fade_in (Frame);
+       void set_fade_out (Frame);
+
        VideoFrameType video_frame_type () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_frame_type;
@@ -135,27 +135,27 @@ public:
                return _colour_conversion;
        }
 
-       boost::optional<float> sample_aspect_ratio () const {
+       boost::optional<double> sample_aspect_ratio () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _sample_aspect_ratio;
        }
 
-       ContentTime fade_in () const {
+       Frame fade_in () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _fade_in;
        }
 
-       ContentTime fade_out () const {
+       Frame fade_out () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _fade_out;
        }
-       
+
        dcp::Size video_size_after_3d_split () const;
        dcp::Size video_size_after_crop () const;
 
        ContentTime dcp_time_to_content_time (DCPTime) const;
 
-       boost::optional<float> fade (VideoFrame) const;
+       boost::optional<double> fade (Frame) const;
 
        void scale_and_crop_to_fit_width ();
        void scale_and_crop_to_fit_height ();
@@ -164,9 +164,11 @@ public:
 
 protected:
        void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
+       void add_properties (std::list<std::pair<std::string, std::string> > &) const;
 
-       ContentTime _video_length;
-       float _video_frame_rate;
+       Frame _video_length;
+       double _video_frame_rate;
+       boost::optional<ColourConversion> _colour_conversion;
 
 private:
        friend struct ffmpeg_pts_offset_test;
@@ -175,18 +177,17 @@ private:
        friend struct audio_sampling_rate_test;
 
        void setup_default_colour_conversion ();
-       
+
        dcp::Size _video_size;
        VideoFrameType _video_frame_type;
        Crop _crop;
        VideoContentScale _scale;
-       boost::optional<ColourConversion> _colour_conversion;
        /** Sample aspect ratio obtained from the content file's header,
            if there is one.
        */
-       boost::optional<float> _sample_aspect_ratio;
-       ContentTime _fade_in;
-       ContentTime _fade_out;
+       boost::optional<double> _sample_aspect_ratio;
+       Frame _fade_in;
+       Frame _fade_out;
 };
 
 #endif