const fix; header guard.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index abc9c5fa3e8db454c803b6de462eba4a809c56ef..f7689763ff363216486ae6d567a2174bba64614d 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -54,7 +54,7 @@ public:
        virtual std::string identifier () const;
 
        virtual void set_default_colour_conversion ();
-       
+
        Frame video_length () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_length;
@@ -65,7 +65,7 @@ public:
                if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
                        return _video_length / 2;
                }
-               
+
                return _video_length;
        }
 
@@ -73,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);
@@ -88,12 +88,12 @@ public:
        void set_bottom_crop (int);
 
        void set_scale (VideoContentScale);
-       void unset_colour_conversion (bool signal = true);
+       void unset_colour_conversion ();
        void set_colour_conversion (ColourConversion);
 
        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,7 +135,7 @@ 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;
        }
@@ -149,13 +149,13 @@ public:
                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 (Frame) const;
+       boost::optional<double> fade (Frame) const;
 
        void scale_and_crop_to_fit_width ();
        void scale_and_crop_to_fit_height ();
@@ -164,9 +164,10 @@ public:
 
 protected:
        void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
+       void add_properties (std::list<std::pair<std::string, std::string> > &) const;
 
        Frame _video_length;
-       float _video_frame_rate;
+       double _video_frame_rate;
        boost::optional<ColourConversion> _colour_conversion;
 
 private:
@@ -176,7 +177,7 @@ private:
        friend struct audio_sampling_rate_test;
 
        void setup_default_colour_conversion ();
-       
+
        dcp::Size _video_size;
        VideoFrameType _video_frame_type;
        Crop _crop;
@@ -184,7 +185,7 @@ private:
        /** Sample aspect ratio obtained from the content file's header,
            if there is one.
        */
-       boost::optional<float> _sample_aspect_ratio;
+       boost::optional<double> _sample_aspect_ratio;
        Frame _fade_in;
        Frame _fade_out;
 };