X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Frender_text.h;h=d1c8c7aee9b357be8252f86ba26b7821af634b2a;hp=0f3a31e211277c78fbb8d9e349f7d1d58338555f;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=d3c009991a782fa51e85828c7600994a9dd91559

diff --git a/src/lib/render_text.h b/src/lib/render_text.h
index 0f3a31e21..d1c8c7aee 100644
--- a/src/lib/render_text.h
+++ b/src/lib/render_text.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,12 +20,14 @@
 
 #include "position_image.h"
 #include "dcpomatic_time.h"
-#include "subtitle_string.h"
+#include "string_text.h"
 #include <dcp/util.h>
 
-class Font;
+namespace dcpomatic {
+	class Font;
+}
 
-std::string marked_up (std::list<SubtitleString> subtitles, int target_height, float fade_factor);
+std::string marked_up (std::list<StringText> subtitles, int target_height, float fade_factor);
 std::list<PositionImage> render_text (
-	std::list<SubtitleString>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size, DCPTime, int
+	std::list<StringText>, std::list<std::shared_ptr<dcpomatic::Font> > fonts, dcp::Size, dcpomatic::DCPTime, int
 	);