summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dcpomatic.cc12
-rw-r--r--src/tools/dcpomatic_batch.cc4
-rw-r--r--src/tools/dcpomatic_combiner.cc4
-rw-r--r--src/tools/dcpomatic_disk.cc2
-rw-r--r--src/tools/dcpomatic_disk_writer.cc2
-rw-r--r--src/tools/dcpomatic_kdm.cc2
-rw-r--r--src/tools/dcpomatic_player.cc8
-rw-r--r--src/tools/dcpomatic_server.cc2
8 files changed, 18 insertions, 18 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 24c5bd5ec..99084c8d6 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -74,7 +74,6 @@
#include "lib/update_checker.h"
#include "lib/cross.h"
#include "lib/content_factory.h"
-#include "lib/compose.hpp"
#include "lib/dcpomatic_socket.h"
#include "lib/hints.h"
#include "lib/dcp_content.h"
@@ -87,6 +86,7 @@
#include "lib/dcpomatic_log.h"
#include "lib/subtitle_encoder.h"
#include "lib/warnings.h"
+#include <dcp/compose.h>
#include <dcp/exceptions.h>
#include <dcp/raw_convert.h>
DCPOMATIC_DISABLE_WARNINGS
@@ -1030,14 +1030,14 @@ private:
#ifdef DCPOMATIC_LINUX
int r = system ("which nautilus");
if (WEXITSTATUS (r) == 0) {
- r = system (String::compose("nautilus \"%1\"", _film->directory()->string()).c_str());
+ r = system (dcp::compose("nautilus \"%1\"", _film->directory()->string()).c_str());
if (WEXITSTATUS (r)) {
error_dialog (this, _("Could not show DCP."), _("Could not run nautilus"));
}
} else {
int r = system ("which konqueror");
if (WEXITSTATUS (r) == 0) {
- r = system (String::compose ("konqueror \"%1\"", _film->directory()->string()).c_str());
+ r = system (dcp::compose ("konqueror \"%1\"", _film->directory()->string()).c_str());
if (WEXITSTATUS (r)) {
error_dialog (this, _("Could not show DCP"), _("Could not run konqueror"));
}
@@ -1046,7 +1046,7 @@ private:
#endif
#ifdef DCPOMATIC_OSX
- int r = system (String::compose ("open -R \"%1\"", _film->dir (_film->dcp_name(false)).string()).c_str());
+ int r = system (dcp::compose ("open -R \"%1\"", _film->dir (_film->dcp_name(false)).string()).c_str());
if (WEXITSTATUS (r)) {
error_dialog (this, _("Could not show DCP"));
}
@@ -1444,7 +1444,7 @@ private:
for (size_t i = 0; i < history.size(); ++i) {
string s;
if (i < 9) {
- s = String::compose ("&%1 %2", i + 1, history[i].string());
+ s = dcp::compose ("&%1 %2", i + 1, history[i].string());
} else {
s = history[i].string();
}
@@ -1638,7 +1638,7 @@ private:
try {
_frame->load_film (_film_to_load);
} catch (exception& e) {
- error_dialog (nullptr, std_to_wx(String::compose(wx_to_std(_("Could not load film %1 (%2)")), _film_to_load)), std_to_wx(e.what()));
+ error_dialog (nullptr, std_to_wx(dcp::compose(wx_to_std(_("Could not load film %1 (%2)")), _film_to_load)), std_to_wx(e.what()));
}
}
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())
);
}
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 4a783d634..0f6004bd2 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -152,7 +152,7 @@ private:
if (!confirm_dialog (
this,
std_to_wx (
- String::compose(wx_to_std(_("The directory %1 already exists and is not empty. "
+ dcp::compose(wx_to_std(_("The directory %1 already exists and is not empty. "
"Are you sure you want to use it?")),
output.string())
)
@@ -162,7 +162,7 @@ private:
} else if (is_regular_file(output)) {
error_dialog (
this,
- String::compose (wx_to_std(_("%1 already exists as a file, so you cannot use it for a DCP.")), output.string())
+ dcp::compose (wx_to_std(_("%1 already exists as a file, so you cannot use it for a DCP.")), output.string())
);
return;
}
diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 7e43c0684..563620693 100644
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -202,7 +202,7 @@ private:
#ifdef DCPOMATIC_OSX
void uninstall()
{
- system(String::compose("osascript \"%1/uninstall_disk.applescript\"", resources_path().string()).c_str());
+ system(dcp::compose("osascript \"%1/uninstall_disk.applescript\"", resources_path().string()).c_str());
}
#endif
diff --git a/src/tools/dcpomatic_disk_writer.cc b/src/tools/dcpomatic_disk_writer.cc
index c638b72eb..ca6618125 100644
--- a/src/tools/dcpomatic_disk_writer.cc
+++ b/src/tools/dcpomatic_disk_writer.cc
@@ -19,7 +19,6 @@
*/
-#include "lib/compose.hpp"
#include "lib/cross.h"
#include "lib/dcpomatic_log.h"
#include "lib/digester.h"
@@ -30,6 +29,7 @@
#include "lib/nanomsg.h"
#include "lib/version.h"
#include "lib/warnings.h"
+#include <dcp/compose.h>
#ifdef DCPOMATIC_POSIX
#include <sys/ioctl.h>
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 4d84f2f33..c83beec74 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -36,7 +36,6 @@
#include "wx/wx_signal_manager.h"
#include "wx/wx_util.h"
#include "lib/cinema.h"
-#include "lib/compose.hpp"
#include "lib/config.h"
#include "lib/cross.h"
#include "lib/dkdm_wrapper.h"
@@ -46,6 +45,7 @@
#include "lib/screen.h"
#include "lib/send_kdm_email_job.h"
#include "lib/util.h"
+#include <dcp/compose.h>
#include <dcp/encrypted_kdm.h>
#include <dcp/decrypted_kdm.h>
#include <dcp/exceptions.h>
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 112f2c065..16847911c 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -38,7 +38,6 @@
#include "lib/util.h"
#include "lib/internet.h"
#include "lib/update_checker.h"
-#include "lib/compose.hpp"
#include "lib/dcp_content.h"
#include "lib/job_manager.h"
#include "lib/job.h"
@@ -56,6 +55,7 @@
#include "lib/ffmpeg_content.h"
#include "lib/dcpomatic_log.h"
#include "lib/file_log.h"
+#include <dcp/compose.h>
#include <dcp/cpl.h>
#include <dcp/dcp.h>
#include <dcp/raw_convert.h>
@@ -694,7 +694,7 @@ private:
try {
load_dcp (history[n]);
} catch (exception& e) {
- error_dialog (0, std_to_wx(String::compose(wx_to_std(_("Could not load DCP %1.")), history[n])), std_to_wx(e.what()));
+ error_dialog (0, std_to_wx(dcp::compose(wx_to_std(_("Could not load DCP %1.")), history[n])), std_to_wx(e.what()));
}
}
}
@@ -955,7 +955,7 @@ private:
for (size_t i = 0; i < history.size(); ++i) {
string s;
if (i < 9) {
- s = String::compose ("&%1 %2", i + 1, history[i].string());
+ s = dcp::compose ("&%1 %2", i + 1, history[i].string());
} else {
s = history[i].string();
}
@@ -1164,7 +1164,7 @@ private:
try {
_frame->load_dcp (_dcp_to_load);
} catch (exception& e) {
- error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load DCP %1.")), _dcp_to_load)), std_to_wx(e.what()));
+ error_dialog (0, std_to_wx (dcp::compose (wx_to_std (_("Could not load DCP %1.")), _dcp_to_load)), std_to_wx(e.what()));
}
}
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 401fb1077..825098e9b 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -241,7 +241,7 @@ public:
#else
string const colour = gui_is_dark() ? "white" : "black";
wxBitmap bitmap (
- bitmap_path(String::compose("dcpomatic_small_%1", colour)),
+ bitmap_path(dcp::compose("dcpomatic_small_%1", colour)),
wxBITMAP_TYPE_PNG
);
wxIcon icon;
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-05 19:45:12 +0000