From da61b62283a95f5937c51024027caed08a358f46 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 31 Dec 2017 02:03:02 +0000 Subject: [PATCH] Try again to fix Windows wxWidgets complain using compose to save all the mucking about. --- src/wx/player_information.cc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/wx/player_information.cc b/src/wx/player_information.cc index 6d091630a..2139d830d 100644 --- a/src/wx/player_information.cc +++ b/src/wx/player_information.cc @@ -22,10 +22,12 @@ #include "wx_util.h" #include "film_viewer.h" #include "lib/playlist.h" +#include "lib/compose.hpp" #include "lib/video_content.h" #include "lib/dcp_content.h" using std::cout; +using std::string; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::optional; @@ -114,15 +116,15 @@ PlayerInformation::triggered_update () optional vfr; vfr = dcp->video_frame_rate (); DCPOMATIC_ASSERT (vfr); - checked_set ( - _dcp[r++], - wxString::Format( - _("Length: %s (%" wxLongLongFmtSpec " frames)"), - std_to_wx(time_to_hmsf(dcp->full_length(), lrint(*vfr))).data(), - dcp->full_length().frames_round(*vfr) - ) + + string const len = String::compose( + wx_to_std(_("Length: %1 (%2 frames)")), + time_to_hmsf(dcp->full_length(), lrint(*vfr)), + dcp->full_length().frames_round(*vfr) ); + checked_set (_dcp[r++], std_to_wx(len)); + dcp::Size decode = dcp->video->size(); optional reduction = _viewer->dcp_decode_reduction(); if (reduction) { -- 2.30.2