Merge branch 'compose-to-fmt-take2'

This removes all uses of String::compose, replacing them with fmt and
updating the i18n strings where required.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/j2k_sync_encoder_thread.cc b/src/lib/j2k_sync_encoder_thread.cc
index 158c12b11..5dbdb18f0 100644
--- a/src/lib/j2k_sync_encoder_thread.cc
+++ b/src/lib/j2k_sync_encoder_thread.cc
@@ -43,11 +43,11 @@ try
 
 	while (true) {
 		if (auto wait = backoff()) {
-			LOG_ERROR(N_("Encoder thread sleeping (due to backoff) for %1s"), wait);
+			LOG_ERROR(N_("Encoder thread sleeping (due to backoff) for {}s"), wait);
 			boost::this_thread::sleep(boost::posix_time::seconds(wait));
 		}
 
-		LOG_TIMING("encoder-sleep thread=%1", thread_id());
+		LOG_TIMING("encoder-sleep thread={}", thread_id());
 		auto frame = _encoder.pop();
 
 		dcp::ScopeGuard frame_guard([this, &frame]() {
@@ -55,7 +55,7 @@ try
 			_encoder.retry(frame);
 		});
 
-		LOG_TIMING("encoder-pop thread=%1 frame=%2 eyes=%3", thread_id(), frame.index(), static_cast<int>(frame.eyes()));
+		LOG_TIMING("encoder-pop thread={} frame={} eyes={}", thread_id(), frame.index(), static_cast<int>(frame.eyes()));
 
 		auto encoded = encode(frame);