diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
| commit | 5b0e331380c83ec9835e8aa42fd342b2f0ad275d (patch) | |
| tree | 13c27f0b3420f5c3a268a5a22a9172675fdc370c /src/wx/player_information.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/wx/player_information.cc')
| -rw-r--r-- | src/wx/player_information.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 <dcp/compose.h> 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) |