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

[dcpomatic.git] / src / lib / frame_rate_change.cc

diff --git a/src/lib/frame_rate_change.cc b/src/lib/frame_rate_change.cc
index 31fce6b6d71182625ebc0a43bc4609d1e7f5ab8c..d0b302bb402a84d76f7c448d4d0405594a32b1e8 100644 (file)
--- 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
@@ -37,14 +37,14 @@ about_equal (float a, float b)
            = Ff + Fd - Ff frames
            = Fd frames
            = Fd/f seconds
- 
+
           So if we accept a difference of 1 frame, ie 1/f seconds, we can
           say that
 
           1/f = Fd/f
        ie 1 = Fd
        ie d = 1/F
- 
+
           So for a 3hr film, ie F = 3 * 60 * 60 = 10800, the acceptable
           FPS error is 1/F ~= 0.0001 ~= 10-e4
        */
@@ -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)
@@ -81,7 +81,7 @@ string
 FrameRateChange::description () const
 {
        string description;
-       
+
        if (!skip && repeat == 1 && !change_speed) {
                description = _("Content and DCP have the same rate.\n");
        } else {
@@ -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);
                }
        }