diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-11 12:49:23 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-12 09:14:06 +0100 |
| commit | 94056bf7f8fdef32da3cd78eff68d58560b4e6be (patch) | |
| tree | 937fad363dc94d65ec20fa2ff7aa3b303310d80f /src/wx/timing_panel.cc | |
| parent | 73654117144c6de0ec4efe39ddc88485df546cc9 (diff) | |
Replace incorrect uses of raw_convert with a new locale_convert.
Diffstat (limited to 'src/wx/timing_panel.cc')
| -rw-r--r-- | src/wx/timing_panel.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index f4de55028..25cf2b524 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -30,8 +30,8 @@ #include "lib/dcp_subtitle_content.h" #include "lib/audio_content.h" #include "lib/text_subtitle_content.h" +#include "lib/locale_convert.h" #include "lib/video_content.h" -#include <dcp/raw_convert.h> #include <boost/foreach.hpp> #include <set> #include <iostream> @@ -42,7 +42,6 @@ using std::set; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::optional; -using dcp::raw_convert; TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer) /* horrid hack for apparent lack of context support with wxWidgets i18n code */ @@ -288,7 +287,7 @@ TimingPanel::film_content_changed (int property) bool const single_frame_image_content = content && dynamic_pointer_cast<const ImageContent> (content) && content->number_of_paths() == 1; if ((check_vc.size() == 1 || count_ac == 1 || count_sc == 1) && !single_frame_image_content) { - checked_set (_video_frame_rate, raw_convert<string> (content->video_frame_rate().get(), 5)); + checked_set (_video_frame_rate, locale_convert<string> (content->video_frame_rate().get(), 5)); _video_frame_rate->Enable (true); } else { checked_set (_video_frame_rate, wxT ("")); @@ -399,7 +398,7 @@ TimingPanel::video_frame_rate_changed () void TimingPanel::set_video_frame_rate () { - double const fr = raw_convert<double> (wx_to_std (_video_frame_rate->GetValue ())); + double const fr = locale_convert<double> (wx_to_std (_video_frame_rate->GetValue ())); BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) { i->set_video_frame_rate (fr); } |