diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-16 08:53:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-16 08:53:37 +0100 |
| commit | 75cb27e8fc24c1b526802289dbddd67127142379 (patch) | |
| tree | 7a8aab486371a6887fb5daaa925e97e7e63ffd82 /src/wx | |
| parent | df16b07cb1802c8f4485d75db3b2dec67521e599 (diff) | |
More float -> double.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/image_sequence_dialog.cc | 4 | ||||
| -rw-r--r-- | src/wx/image_sequence_dialog.h | 2 | ||||
| -rw-r--r-- | src/wx/timing_panel.cc | 4 | ||||
| -rw-r--r-- | src/wx/wx_util.cc | 2 | ||||
| -rw-r--r-- | src/wx/wx_util.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/wx/image_sequence_dialog.cc b/src/wx/image_sequence_dialog.cc index 48af6afa1..12d12182f 100644 --- 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 536ae6680..9b662e261 100644 --- 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 8ce64777b..f92505c33 100644 --- 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 c05a271f7..5acc2d6cd 100644 --- 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 f2ab2d8c5..da544feb1 100644 --- 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); |
