diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-05-11 02:15:05 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-05-11 13:12:21 +0200 |
| commit | 0dccb03a2ab9f015e4aa8cbe588d2ad0fcc6f087 (patch) | |
| tree | cc9075c3a9017d7b4295bed52d429077c64cb4c7 /src | |
| parent | 8b377dff83c734b3754688a6c6d665e697201b10 (diff) | |
Use fmt::format() instead of locale_convert().
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/wx_util.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index e4229c1b7..ec9f178c3 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -38,7 +38,6 @@ #include "lib/util.h" #include "lib/variant.h" #include "lib/version.h" -#include <dcp/locale_convert.h> #include <dcp/warnings.h> LIBDCP_DISABLE_WARNINGS #include <wx/display.h> @@ -51,6 +50,7 @@ LIBDCP_DISABLE_WARNINGS #include <wx/uilocale.h> #endif LIBDCP_ENABLE_WARNINGS +#include <fmt/format.h> #include <boost/thread.hpp> @@ -59,7 +59,6 @@ using std::vector; using std::pair; using std::shared_ptr; using boost::optional; -using dcp::locale_convert; using namespace dcpomatic; @@ -599,17 +598,17 @@ setup_audio_channels_choice (wxChoice* choice, int minimum) vector<pair<string, string>> items; for (int i = minimum; i <= 16; i += 2) { if (i == 2) { - items.push_back (make_pair(wx_to_std(_("2 - stereo")), locale_convert<string>(i))); + items.push_back(make_pair(wx_to_std(_("2 - stereo")), fmt::to_string(i))); } else if (i == 4) { - items.push_back (make_pair(wx_to_std(_("4 - L/C/R/Lfe")), locale_convert<string>(i))); + items.push_back(make_pair(wx_to_std(_("4 - L/C/R/Lfe")), fmt::to_string(i))); } else if (i == 6) { - items.push_back (make_pair(wx_to_std(_("6 - 5.1")), locale_convert<string>(i))); + items.push_back(make_pair(wx_to_std(_("6 - 5.1")), fmt::to_string(i))); } else if (i == 8) { - items.push_back (make_pair(wx_to_std(_("8 - 5.1/HI/VI")), locale_convert<string>(i))); + items.push_back(make_pair(wx_to_std(_("8 - 5.1/HI/VI")), fmt::to_string(i))); } else if (i == 12) { - items.push_back (make_pair(wx_to_std(_("12 - 7.1/HI/VI")), locale_convert<string>(i))); + items.push_back(make_pair(wx_to_std(_("12 - 7.1/HI/VI")), fmt::to_string(i))); } else { - items.push_back (make_pair(locale_convert<string> (i), locale_convert<string>(i))); + items.push_back(make_pair(fmt::to_string(i), fmt::to_string(i))); } } |