From 5b0e331380c83ec9835e8aa42fd342b2f0ad275d Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 10 Jul 2021 02:02:19 +0200
Subject: Use dcp::compose rather than our own.

---
 src/lib/subtitle_encoder.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/subtitle_encoder.cc')

diff --git a/src/lib/subtitle_encoder.cc b/src/lib/subtitle_encoder.cc
index ba47e1231..531c9cdcb 100644
--- a/src/lib/subtitle_encoder.cc
+++ b/src/lib/subtitle_encoder.cc
@@ -19,11 +19,11 @@
 */
 
 
-#include "compose.hpp"
 #include "font_data.h"
 #include "job.h"
 #include "player.h"
 #include "subtitle_encoder.h"
+#include <dcp/compose.h>
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/raw_convert.h>
 #include <dcp/smpte_subtitle_asset.h>
@@ -72,7 +72,7 @@ SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> j
 			if (files > 1) {
 				/// TRANSLATORS: _reel%1 here is to be added to an export filename to indicate
 				/// which reel it is.  Preserve the %1; it will be replaced with the reel number.
-				filename /= String::compose("%1_reel%2", initial_name, i + 1);
+				filename /= dcp::compose("%1_reel%2", initial_name, i + 1);
 			} else {
 				filename /= initial_name;
 			}
-- 
cgit v1.2.3