From 5b0e331380c83ec9835e8aa42fd342b2f0ad275d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 10 Jul 2021 02:02:19 +0200 Subject: Use dcp::compose rather than our own. --- src/wx/player_information.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/wx/player_information.cc') diff --git a/src/wx/player_information.cc b/src/wx/player_information.cc index f0eaa59bb..ae5ebe617 100644 --- a/src/wx/player_information.cc +++ b/src/wx/player_information.cc @@ -22,11 +22,11 @@ #include "wx_util.h" #include "film_viewer.h" #include "lib/playlist.h" -#include "lib/compose.hpp" #include "lib/video_content.h" #include "lib/audio_content.h" #include "lib/dcp_content.h" #include "lib/film.h" +#include using std::cout; using std::string; @@ -157,7 +157,7 @@ PlayerInformation::triggered_update () vfr = dcp->video_frame_rate (); DCPOMATIC_ASSERT (vfr); - string const len = String::compose( + string const len = dcp::compose( wx_to_std(_("Length: %1 (%2 frames)")), time_to_hmsf(dcp->full_length(fv->film()), lrint(*vfr)), dcp->full_length(fv->film()).frames_round(*vfr) -- cgit v1.2.3