diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-16 00:53:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-16 00:53:54 +0100 |
| commit | 4a4725e41bf4070969223f9c40885063c50e61d0 (patch) | |
| tree | 7c8896f8080b7bf66773d5b63ded45b83b675712 /src/lib/video_content.h | |
| parent | 6300edd66433dffed9fb30a0b3b8db7ca3355809 (diff) | |
float -> double in a few places.
Diffstat (limited to 'src/lib/video_content.h')
| -rw-r--r-- | src/lib/video_content.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 71c20e737..fdd274985 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -74,13 +74,13 @@ public: 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); @@ -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; } @@ -155,7 +155,7 @@ public: 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 (); @@ -167,7 +167,7 @@ protected: 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: @@ -185,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; }; |
