Use dcp::compose rather than our own.compose

23 files changed, 63 insertions, 63 deletions

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 73c569282..3a2558f14 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -26,8 +26,8 @@
 #include "wx_util.h"
 #include "static_text.h"
 #include "lib/version.h"
-#include "lib/compose.hpp"
 #include "lib/warnings.h"
+#include <dcp/compose.h>
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/notebook.h>
 #include <wx/hyperlink.h>
@@ -57,9 +57,9 @@ AboutDialog::AboutDialog (wxWindow* parent)
 
 	wxString s;
 	if (strcmp (dcpomatic_git_commit, "release") == 0) {
-		t = new StaticText (this, std_to_wx(String::compose("Version %1", dcpomatic_version)));
+		t = new StaticText (this, std_to_wx(dcp::compose("Version %1", dcpomatic_version)));
 	} else {
-		t = new StaticText (this, std_to_wx(String::compose("Version %1 git %2", dcpomatic_version, dcpomatic_git_commit)));
+		t = new StaticText (this, std_to_wx(dcp::compose("Version %1 git %2", dcpomatic_version, dcpomatic_git_commit)));
 	}
 	t->SetFont (version_font);
 	sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 2));
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 90a4aa91d..cfb08eb54 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -24,7 +24,7 @@
 #include "film_viewer.h"
 #include "lib/audio_decoder.h"
 #include "lib/audio_analysis.h"
-#include "lib/compose.hpp"
+#include <dcp/compose.h>
 #include <wx/graphics.h>
 #include <boost/bind/bind.hpp>
 #include <iostream>
@@ -190,7 +190,7 @@ AudioPlot::paint ()
 		int const y = (metrics.height - (i - _minimum) * metrics.y_scale) - metrics.y_origin;
 		h_grid.MoveToPoint (metrics.db_label_width - 4, y);
 		h_grid.AddLineToPoint (metrics.db_label_width + data_width, y);
-		gc->DrawText (std_to_wx (String::compose ("%1dB", i)), 0, y - (db_label_height / 2));
+		gc->DrawText (std_to_wx (dcp::compose ("%1dB", i)), 0, y - (db_label_height / 2));
 	}
 
 	gc->SetPen (wxPen (wxColour (200, 200, 200)));
diff --git a/src/wx/barco_alchemy_certificate_panel.cc b/src/wx/barco_alchemy_certificate_panel.cc
index a1d6167aa..25ec3511c 100644
--- a/src/wx/barco_alchemy_certificate_panel.cc
+++ b/src/wx/barco_alchemy_certificate_panel.cc
@@ -22,8 +22,8 @@
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
 #include "lib/internet.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
+#include <dcp/compose.h>
 
 using std::string;
 using boost::optional;
@@ -55,7 +55,7 @@ void
 BarcoAlchemyCertificatePanel::do_download ()
 {
 	string const serial = wx_to_std (_serial->GetValue());
-	string const url = String::compose (
+	string const url = dcp::compose (
 		"ftp://%1:%2@certificates.barco.com/%3xxx/%4/Barco-ICMP.%5_cert.pem",
 		Config::instance()->barco_username().get(),
 		Config::instance()->barco_password().get(),
diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc
index ab131e015..77a067fb5 100644
--- a/src/wx/christie_certificate_panel.cc
+++ b/src/wx/christie_certificate_panel.cc
@@ -22,8 +22,8 @@
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
 #include "lib/internet.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
+#include <dcp/compose.h>
 
 using std::string;
 using boost::optional;
@@ -50,7 +50,7 @@ ChristieCertificatePanel::ChristieCertificatePanel (DownloadCertificateDialog* d
 void
 ChristieCertificatePanel::do_download ()
 {
-	string const prefix = String::compose(
+	string const prefix = dcp::compose(
 		"ftp://%1:%2@certificates.christiedigital.com/Certificates/",
 		Config::instance()->christie_username().get(),
 		Config::instance()->christie_password().get()
@@ -59,7 +59,7 @@ ChristieCertificatePanel::do_download ()
 	string serial = wx_to_std (_serial->GetValue());
 	serial.insert (0, 12 - serial.length(), '0');
 
-	string const url = String::compose ("%1F-IMB/F-IMB_%2_sha256.pem", prefix, serial);
+	string const url = dcp::compose ("%1F-IMB/F-IMB_%2_sha256.pem", prefix, serial);
 
 	optional<string> all_errors;
 	bool ok = true;
@@ -68,7 +68,7 @@ ChristieCertificatePanel::do_download ()
 	if (error) {
 		all_errors = *error;
 
-		string const url = String::compose ("%1IMB-S2/IMB-S2_%2_sha256.pem", prefix, serial);
+		string const url = dcp::compose ("%1IMB-S2/IMB-S2_%2_sha256.pem", prefix, serial);
 
 		error = get_from_url (url, true, false, boost::bind(&DownloadCertificatePanel::load_certificate_from_chain, this, _1));
 		if (error) {
diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 7fcfc0808..73ad98a26 100644
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -24,7 +24,7 @@
 #include "lib/string_text.h"
 #include "lib/butler.h"
 #include "lib/text_content.h"
-#include "lib/compose.hpp"
+#include <dcp/compose.h>
 #include <boost/bind/bind.hpp>
 
 using std::list;
@@ -249,7 +249,7 @@ ClosedCaptionsDialog::update_tracks (shared_ptr<const Film> film)
 
 	_track->Clear ();
 	for (auto const& i: _tracks) {
-		_track->Append (std_to_wx(String::compose("%1 (%2)", i.name, i.language ? i.language->to_string() : wx_to_std(_("Unknown")))));
+		_track->Append (std_to_wx(dcp::compose("%1 (%2)", i.name, i.language ? i.language->to_string() : wx_to_std(_("Unknown")))));
 	}
 
 	if (_track->GetCount() > 0) {
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index bcc699913..5c2b19f61 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -31,7 +31,6 @@
 #include "wx_util.h"
 #include "lib/audio_content.h"
 #include "lib/case_insensitive_sorter.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/content_factory.h"
 #include "lib/cross.h"
@@ -45,6 +44,7 @@
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
+#include <dcp/compose.h>
 #include <wx/wx.h>
 #include <wx/notebook.h>
 #include <wx/listctrl.h>
diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index 9c236abeb..a43a5fc94 100644
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -22,8 +22,8 @@
 #include "content_panel.h"
 #include "wx_util.h"
 #include "lib/dcp_content.h"
-#include "lib/compose.hpp"
 #include "lib/log.h"
+#include <dcp/compose.h>
 #include <wx/notebook.h>
 
 using std::list;
diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index 817867cc1..6049a6818 100644
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -22,10 +22,10 @@
 #include "dolby_doremi_certificate_panel.h"
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/internet.h"
 #include "lib/signal_manager.h"
 #include "lib/util.h"
+#include <dcp/compose.h>
 #include <dcp/raw_convert.h>
 #include <curl/curl.h>
 #include <zip.h>
@@ -53,30 +53,30 @@ DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (DownloadCertificateDia
 static void
 try_dcp2000 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-	urls.push_back (String::compose("%1%2xxx/dcp2000-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
-	files.push_back (String::compose("dcp2000-%1.cert.sha256.pem", serial));
+	urls.push_back (dcp::compose("%1%2xxx/dcp2000-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back (dcp::compose("dcp2000-%1.cert.sha256.pem", serial));
 
-	urls.push_back (String::compose("%1%2xxx/dcp2000-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
-	files.push_back (String::compose("dcp2000-%1.cert.sha256.pem", serial));
+	urls.push_back (dcp::compose("%1%2xxx/dcp2000-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back (dcp::compose("dcp2000-%1.cert.sha256.pem", serial));
 
-	urls.push_back (String::compose("%1%2xxx/dcp2000-%3.certs.zip", prefix, serial.substr(0, 3), serial));
-	files.push_back (String::compose("dcp2000-%1.cert.sha256.pem", serial));
+	urls.push_back (dcp::compose("%1%2xxx/dcp2000-%3.certs.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back (dcp::compose("dcp2000-%1.cert.sha256.pem", serial));
 }
 
 
 static void
 try_imb (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-	urls.push_back (String::compose("%1%2xxx/imb-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
-	files.push_back (String::compose("imb-%1.cert.sha256.pem", serial));
+	urls.push_back (dcp::compose("%1%2xxx/imb-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back (dcp::compose("imb-%1.cert.sha256.pem", serial));
 }
 
 
 static void
 try_ims (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-	urls.push_back (String::compose("%1%2xxx/ims-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
-	files.push_back (String::compose("ims-%1.cert.sha256.pem", serial));
+	urls.push_back (dcp::compose("%1%2xxx/ims-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back (dcp::compose("ims-%1.cert.sha256.pem", serial));
 }
 
 
@@ -92,11 +92,11 @@ try_cat862 (list<string>& urls, list<string>& files, string prefix, string seria
 		cat862 = "CAT862_617000_and_higher";
 	} else {
 		int const lower = serial_int - (serial_int % 1000);
-		cat862 = String::compose ("CAT862_%1-%2", lower, lower + 999);
+		cat862 = dcp::compose ("CAT862_%1-%2", lower, lower + 999);
 	}
 
-	urls.push_back (String::compose("%1%2/cert_Dolby256-CAT862-%3.zip", prefix, cat862, serial_int));
-	files.push_back (String::compose("cert_Dolby256-CAT862-%1.pem.crt", serial_int));
+	urls.push_back (dcp::compose("%1%2/cert_Dolby256-CAT862-%3.zip", prefix, cat862, serial_int));
+	files.push_back (dcp::compose("cert_Dolby256-CAT862-%1.pem.crt", serial_int));
 }
 
 
@@ -112,11 +112,11 @@ try_dsp100 (list<string>& urls, list<string>& files, string prefix, string seria
 		dsp100 = "DSP100_3000_and_higher";
 	} else {
 		int const lower = serial_int - (serial_int % 1000);
-		dsp100 = String::compose ("DSP100_%1_thru_%2", lower, lower + 999);
+		dsp100 = dcp::compose ("DSP100_%1_thru_%2", lower, lower + 999);
 	}
 
-	urls.push_back (String::compose("%1%2/cert_Dolby256-DSP100-%3.zip", prefix, dsp100, serial_int));
-	files.push_back (String::compose("cert_Dolby256-DSP100-%1.pem.crt", serial_int));
+	urls.push_back (dcp::compose("%1%2/cert_Dolby256-DSP100-%3.zip", prefix, dsp100, serial_int));
+	files.push_back (dcp::compose("cert_Dolby256-DSP100-%1.pem.crt", serial_int));
 }
 
 
@@ -132,11 +132,11 @@ try_cat745 (list<string>& urls, list<string>& files, string prefix, string seria
 		cat745 = "CAT745_6000_and_higher";
 	} else {
 		int const lower = serial_int - (serial_int % 1000);
-		cat745 = String::compose("CAT745_%1_thru_%2", lower, lower + 999);
+		cat745 = dcp::compose("CAT745_%1_thru_%2", lower, lower + 999);
 	}
 
-	urls.push_back (String::compose("%1%2/cert_Dolby-CAT745-%3.zip", prefix, cat745, serial_int));
-	files.push_back (String::compose("cert_Dolby-CAT745-%1.pem.crt", serial_int));
+	urls.push_back (dcp::compose("%1%2/cert_Dolby-CAT745-%3.zip", prefix, cat745, serial_int));
+	files.push_back (dcp::compose("cert_Dolby-CAT745-%1.pem.crt", serial_int));
 }
 
 
@@ -146,16 +146,16 @@ try_cp850 (list<string>& urls, list<string>& files, string prefix, string serial
 	int const serial_int = raw_convert<int> (serial.substr (1));
 
 	int const lower = serial_int - (serial_int % 1000);
-	urls.push_back (String::compose ("%1CP850_CAT1600_F%2-F%3/cert_RMB_SPB_MDE_FMA.Dolby-CP850-F%4.zip", prefix, lower, lower + 999, serial_int));
-	files.push_back (String::compose ("cert_RMB_SPB_MDE_FMA.Dolby-CP850-F%1.pem.crt", serial_int));
+	urls.push_back (dcp::compose ("%1CP850_CAT1600_F%2-F%3/cert_RMB_SPB_MDE_FMA.Dolby-CP850-F%4.zip", prefix, lower, lower + 999, serial_int));
+	files.push_back (dcp::compose ("cert_RMB_SPB_MDE_FMA.Dolby-CP850-F%1.pem.crt", serial_int));
 }
 
 
 static void
 try_ims3000 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-	urls.push_back (String::compose ("%1%2xxx/cert_Dolby-IMS3000-%3-SMPTE.zip", prefix, serial.substr(0, 3), serial));
-	files.push_back (String::compose("cert_Dolby-IMS3000-%1-SMPTE.pem", serial));
+	urls.push_back (dcp::compose ("%1%2xxx/cert_Dolby-IMS3000-%3-SMPTE.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back (dcp::compose("cert_Dolby-IMS3000-%1-SMPTE.pem", serial));
 }
 
 
diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc
index c30b05008..b4bdd1ce4 100644
--- a/src/wx/download_certificate_panel.cc
+++ b/src/wx/download_certificate_panel.cc
@@ -22,9 +22,9 @@
 #include "download_certificate_dialog.h"
 #include "download_certificate_panel.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/signal_manager.h"
 #include <dcp/certificate_chain.h>
+#include <dcp/compose.h>
 #include <dcp/exceptions.h>
 #include <dcp/util.h>
 #include <boost/bind/bind.hpp>
@@ -63,7 +63,7 @@ DownloadCertificatePanel::load_certificate (boost::filesystem::path file)
 	try {
 		_certificate = dcp::Certificate (dcp::file_to_string(file));
 	} catch (dcp::MiscError& e) {
-		return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what());
+		return dcp::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what());
 	}
 	return {};
 }
@@ -75,7 +75,7 @@ DownloadCertificatePanel::load_certificate_from_chain (boost::filesystem::path f
 	try {
 		_certificate = dcp::CertificateChain (dcp::file_to_string(file)).leaf();
 	} catch (dcp::MiscError& e) {
-		return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what());
+		return dcp::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what());
 	}
 	return {};
 }
diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc
index 516ed86ae..55e5a534d 100644
--- a/src/wx/film_name_location_dialog.cc
+++ b/src/wx/film_name_location_dialog.cc
@@ -26,7 +26,7 @@
 #include "dir_picker_ctrl.h"
 #endif
 #include "lib/config.h"
-#include "lib/compose.hpp"
+#include <dcp/compose.h>
 #include <wx/stdpaths.h>
 #include <boost/filesystem.hpp>
 
@@ -139,7 +139,7 @@ FilmNameLocationDialog::check_path ()
 		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?")),
 						    path().string().c_str())
 				    )
@@ -149,7 +149,7 @@ FilmNameLocationDialog::check_path ()
 	} else if (boost::filesystem::is_regular_file(path())) {
 		error_dialog (
 			this,
-			String::compose (wx_to_std(_("%1 already exists as a file, so you cannot use it for a film.")), path().c_str())
+			dcp::compose (wx_to_std(_("%1 already exists as a file, so you cannot use it for a film.")), path().c_str())
 			);
 		return false;
 	}
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 4ea2a8b00..031c00154 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -48,12 +48,12 @@
 #include "lib/butler.h"
 #include "lib/log.h"
 #include "lib/config.h"
-#include "lib/compose.hpp"
 #include "lib/dcpomatic_log.h"
 #include "lib/text_content.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
+#include <dcp/compose.h>
 #include <dcp/exceptions.h>
 #include <wx/tglbtn.h>
 #include <iostream>
diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc
index f7f86895d..555c1b232 100644
--- a/src/wx/gdc_certificate_panel.cc
+++ b/src/wx/gdc_certificate_panel.cc
@@ -22,8 +22,8 @@
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
 #include "lib/internet.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
+#include <dcp/compose.h>
 
 using std::string;
 using boost::optional;
@@ -54,7 +54,7 @@ GDCCertificatePanel::do_download ()
 		/* We're adding the A ourselves */
 		serial = serial.substr(1);
 	}
-	string const url = String::compose(
+	string const url = dcp::compose(
 		"ftp://%1:%2@ftp.gdc-tech.com/SHA256/A%3.crt.pem",
 		Config::instance()->gdc_username().get(),
 		Config::instance()->gdc_password().get(),
diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 19243393c..e49227ef1 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -33,7 +33,7 @@
 #include "lib/job.h"
 #include "lib/util.h"
 #include "lib/exceptions.h"
-#include "lib/compose.hpp"
+#include <dcp/compose.h>
 #include <iostream>
 
 
diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 231176e4f..cb1a9fcdd 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -27,11 +27,11 @@
 #include "dcpomatic_button.h"
 #include "lib/job.h"
 #include "lib/job_manager.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/send_notification_email_job.h"
 #include "lib/transcode_job.h"
 #include "lib/analyse_audio_job.h"
+#include <dcp/compose.h>
 #include <wx/wx.h>
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/wx/name_format_editor.cc b/src/wx/name_format_editor.cc
index b2c11b50c..969cd6076 100644
--- a/src/wx/name_format_editor.cc
+++ b/src/wx/name_format_editor.cc
@@ -44,7 +44,7 @@ NameFormatEditor::NameFormatEditor (wxWindow* parent, dcp::NameFormat name, dcp:
 	_panel->SetSizer (_sizer);
 
 	for (auto const& i: titles) {
-		auto t = new StaticText (_panel, std_to_wx (String::compose ("%%%1 %2", i.first, i.second)));
+		auto t = new StaticText (_panel, std_to_wx (dcp::compose ("%%%1 %2", i.first, i.second)));
 		_sizer->Add (t);
 		auto font = t->GetFont();
 		font.SetStyle (wxFONTSTYLE_ITALIC);
diff --git a/src/wx/name_format_editor.h b/src/wx/name_format_editor.h
index 596b42740..972f32655 100644
--- a/src/wx/name_format_editor.h
+++ b/src/wx/name_format_editor.h
@@ -23,8 +23,8 @@
 #define DCPOMATIC_NAME_FORMAT_EDITOR_H
 
 
-#include "lib/compose.hpp"
 #include "lib/warnings.h"
+#include <dcp/compose.h>
 #include <dcp/name_format.h>
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
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)
diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc
index d65cb0fcc..b935b0ba2 100644
--- a/src/wx/playlist_controls.cc
+++ b/src/wx/playlist_controls.cc
@@ -30,7 +30,7 @@
 #include "lib/scoped_temporary.h"
 #include "lib/internet.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/compose.hpp"
+#include <dcp/compose.h>
 #include <dcp/raw_convert.h>
 #include <dcp/exceptions.h>
 #include <wx/listctrl.h>
diff --git a/src/wx/qube_certificate_panel.cc b/src/wx/qube_certificate_panel.cc
index e1c6bfb41..403fff695 100644
--- a/src/wx/qube_certificate_panel.cc
+++ b/src/wx/qube_certificate_panel.cc
@@ -23,8 +23,8 @@
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
 #include "lib/internet.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
+#include <dcp/compose.h>
 #include <boost/algorithm/string/predicate.hpp>
 
 
@@ -50,7 +50,7 @@ QubeCertificatePanel::QubeCertificatePanel (DownloadCertificateDialog* dialog, s
 void
 QubeCertificatePanel::do_download ()
 {
-	auto files = ls_url(String::compose("%1SMPTE-%2/", base, _type));
+	auto files = ls_url(dcp::compose("%1SMPTE-%2/", base, _type));
 	if (files.empty()) {
 		error_dialog (this, _("Could not read certificates from Qube server."));
 		return;
@@ -59,7 +59,7 @@ QubeCertificatePanel::do_download ()
 	auto const serial = wx_to_std(_serial->GetValue());
 	optional<string> name;
 	for (auto i: files) {
-		if (boost::algorithm::starts_with(i, String::compose("%1-%2-", _type, serial))) {
+		if (boost::algorithm::starts_with(i, dcp::compose("%1-%2-", _type, serial))) {
 			name = i;
 			break;
 		}
@@ -71,7 +71,7 @@ QubeCertificatePanel::do_download ()
 		return;
 	}
 
-	auto error = get_from_url (String::compose("%1SMPTE-%2/%3", base, _type, *name), true, false, boost::bind(&DownloadCertificatePanel::load_certificate, this, _1));
+	auto error = get_from_url (dcp::compose("%1SMPTE-%2/%3", base, _type, *name), true, false, boost::bind(&DownloadCertificatePanel::load_certificate, this, _1));
 
 	if (error) {
 		_dialog->message()->SetLabel(wxT(""));
diff --git a/src/wx/recipient_dialog.cc b/src/wx/recipient_dialog.cc
index d59226a96..b6638edd8 100644
--- a/src/wx/recipient_dialog.cc
+++ b/src/wx/recipient_dialog.cc
@@ -25,8 +25,8 @@
 #include "download_certificate_dialog.h"
 #include "table_dialog.h"
 #include "dcpomatic_button.h"
-#include "lib/compose.hpp"
 #include "lib/util.h"
+#include <dcp/compose.h>
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
 #include "lib/warnings.h"
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 8da8f061e..e438ca87e 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -26,9 +26,9 @@
 #include "static_text.h"
 #include "table_dialog.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/util.h"
 #include "lib/warnings.h"
+#include <dcp/compose.h>
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
 DCPOMATIC_DISABLE_WARNINGS
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 975f7cd9d..8f4ea0cea 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -23,9 +23,9 @@
 #include "film_editor.h"
 #include "timeline_dialog.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/cross.h"
 #include "lib/playlist.h"
+#include <dcp/compose.h>
 #include <wx/graphics.h>
 #include <iostream>
 #include <list>
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index a0beb8f72..b0ed81cc4 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -646,7 +646,7 @@ bitmap_path (string name)
 	base = resources_path();
 #endif
 
-	auto p = base / String::compose("%1.png", name);
+	auto p = base / dcp::compose("%1.png", name);
 	return std_to_wx (p.string());
 }