More float -> double.

3 files changed, 11 insertions, 11 deletions

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 0c7e7589b..531a33c03 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -63,7 +63,7 @@ DCPDecoder::pass ()
 		return true;
 	}
 
-	float const vfr = _dcp_content->video_frame_rate ();
+	double const vfr = _dcp_content->video_frame_rate ();
 	int64_t const frame = _next.frames (vfr);
 
 	if ((*_reel)->main_picture ()) {
@@ -164,7 +164,7 @@ DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) cons
 	/* XXX: inefficient */
 
 	list<ContentTimePeriod> ctp;
-	float const vfr = _dcp_content->video_frame_rate ();
+	double const vfr = _dcp_content->video_frame_rate ();
 
 	BOOST_FOREACH (shared_ptr<dcp::Reel> r, _reels) {
 		if (!r->main_subtitle ()) {
diff --git a/src/lib/frame_rate_change.cc b/src/lib/frame_rate_change.cc
index d327f8e31..d0b302bb4 100644
--- a/src/lib/frame_rate_change.cc
+++ b/src/lib/frame_rate_change.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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
@@ -26,7 +26,7 @@
 using std::string;
 
 static bool
-about_equal (float a, float b)
+about_equal (double a, double b)
 {
 	/* A film of F seconds at f FPS will be Ff frames;
 	   Consider some delta FPS d, so if we run the same
@@ -53,7 +53,7 @@ about_equal (float a, float b)
 }
 
 
-FrameRateChange::FrameRateChange (float source_, int dcp_)
+FrameRateChange::FrameRateChange (double source_, int dcp_)
 	: source (source_)
 	, dcp (dcp_)
 	, skip (false)
@@ -94,7 +94,7 @@ FrameRateChange::description () const
 		}
 
 		if (change_speed) {
-			float const pc = dcp * 100 / (source * factor());
+			double const pc = dcp * 100 / (source * factor());
 			description += String::compose (_("DCP will run at %1%% of the content speed.\n"), pc);
 		}
 	}
diff --git a/src/lib/frame_rate_change.h b/src/lib/frame_rate_change.h
index f5244fea2..3df9225b7 100644
--- a/src/lib/frame_rate_change.h
+++ b/src/lib/frame_rate_change.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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
@@ -24,12 +24,12 @@
 
 struct FrameRateChange
 {
-	FrameRateChange (float, int);
+	FrameRateChange (double, int);
 
 	/** @return factor by which to multiply a source frame rate
 	    to get the effective rate after any skip or repeat has happened.
 	*/
-	float factor () const {
+	double factor () const {
 		if (skip) {
 			return 0.5;
 		}
@@ -37,7 +37,7 @@ struct FrameRateChange
 		return repeat;
 	}
 
-	float source;
+	double source;
 	int dcp;
 
 	/** true to skip every other frame */
@@ -58,7 +58,7 @@ struct FrameRateChange
 	/** Amount by which the video is being sped-up in the DCP; e.g. for a
 	 *  24fps source in a 25fps DCP this would be 25/24.
 	 */
-	float speed_up;
+	double speed_up;
 
 	std::string description () const;
 };