More float -> double.

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 0c7e7589bc2d9772d185a3d1e906a82e4e1c0052..531a33c03491bb4c05991f97c4f6853c5c8f3a13 100644 (file)
--- 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 d327f8e31ad151d8cdd7e7c517b836c28394b78f..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
@@ -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 f5244fea2b5d68491039b5c52db71d4ca81dd35f..3df9225b7f2ded99b3ff55e1e123716dd55defdd 100644 (file)
--- 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;
 };

diff --git a/src/wx/image_sequence_dialog.cc b/src/wx/image_sequence_dialog.cc
index 48af6afa1198bbee816c6638454426bdfd22f722..12d12182f97ec37e79ee00102f12c8bacb9c0080 100644 (file)
--- a/src/wx/image_sequence_dialog.cc
+++ b/src/wx/image_sequence_dialog.cc
@@ -29,11 +29,11 @@ ImageSequenceDialog::ImageSequenceDialog (wxWindow* parent)
        layout ();
 }
 
-float
+double
 ImageSequenceDialog::frame_rate () const
 {
        try {
-               return raw_convert<float> (wx_to_std (_frame_rate->GetValue ()));
+               return raw_convert<double> (wx_to_std (_frame_rate->GetValue ()));
        } catch (...) {
 
        }

diff --git a/src/wx/image_sequence_dialog.h b/src/wx/image_sequence_dialog.h
index 536ae6680273d34ebbe2a0072b1b648c4f0212f5..9b662e2616d451d90ea3472252a9d558da3eac02 100644 (file)
--- a/src/wx/image_sequence_dialog.h
+++ b/src/wx/image_sequence_dialog.h
@@ -25,7 +25,7 @@ class ImageSequenceDialog : public TableDialog
 public:
        ImageSequenceDialog (wxWindow* parent);
 
-       float frame_rate () const;
+       double frame_rate () const;
 
 private:
        wxTextCtrl* _frame_rate;

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 8ce64777bc9441fcad37830b67bba8087281c34b..f92505c333863e1e093e9496246ec3eea028fd34 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -248,7 +248,7 @@ TimingPanel::film_content_changed (int property)
        }
 
        if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
-               set<float> check;
+               set<double> check;
                shared_ptr<VideoContent> vc;
                for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
                        shared_ptr<VideoContent> t = dynamic_pointer_cast<VideoContent> (*i);
@@ -346,7 +346,7 @@ TimingPanel::set_video_frame_rate ()
        for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
                shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
                if (vc) {
-                       vc->set_video_frame_rate (raw_convert<float> (wx_to_std (_video_frame_rate->GetValue ())));
+                       vc->set_video_frame_rate (raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())));
                }
                _set_video_frame_rate->Enable (false);
        }

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index c05a271f7bfbfa6c8095b6eefcfe01db5c570618..5acc2d6cd1781b9585a8e7b1d44ca430df73247b 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -332,7 +332,7 @@ context_translation (wxString s)
 }
 
 wxString
-time_to_timecode (DCPTime t, float fps)
+time_to_timecode (DCPTime t, double fps)
 {
        double w = t.seconds ();
        int const h = (w / 3600);

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index f2ab2d8c599311573da9013204f49b2424dc725e..da544feb18fc9e3e0a2a975a44274fb75b755caf 100644 (file)
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -66,7 +66,7 @@ extern wxString std_to_wx (std::string);
 extern void dcpomatic_setup_i18n ();
 extern wxString context_translation (wxString);
 extern std::string string_client_data (wxClientData* o);
-extern wxString time_to_timecode (DCPTime t, float fps);
+extern wxString time_to_timecode (DCPTime t, double fps);
 
 extern void checked_set (wxFilePickerCtrl* widget, std::string value);
 extern void checked_set (wxSpinCtrl* widget, int value);