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/tools/dcpomatic_batch.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/tools/dcpomatic_batch.cc')
| -rw-r--r-- | src/tools/dcpomatic_batch.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 061470602..08cd7248b 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -26,7 +26,6 @@ #include "wx/servers_list_dialog.h" #include "wx/wx_signal_manager.h" #include "wx/wx_util.h" -#include "lib/compose.hpp" #include "lib/config.h" #include "lib/dcpomatic_socket.h" #include "lib/film.h" @@ -35,6 +34,7 @@ #include "lib/transcode_job.h" #include "lib/util.h" #include "lib/version.h" +#include <dcp/compose.h> #include <wx/aboutdlg.h> #include <wx/cmdline.h> #include <wx/preferences.h> @@ -454,7 +454,7 @@ class App : public wxApp } catch (exception& e) { error_dialog ( 0, - std_to_wx(String::compose(wx_to_std(_("Could not load film %1")), i.string())), + std_to_wx(dcp::compose(wx_to_std(_("Could not load film %1")), i.string())), std_to_wx(e.what()) ); } |