Barely-functioning GL playback with new arrangement.

[dcpomatic.git] / src / lib / render_text.h

diff --git a/src/lib/render_text.h b/src/lib/render_text.h
index 0f3a31e211277c78fbb8d9e349f7d1d58338555f..7187ca30b5c0c28ea2a9d9ff5ddcbd1fc43dde3a 100644 (file)
--- 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<boost::shared_ptr<dcpomatic::Font> > fonts, dcp::Size, dcpomatic::DCPTime, int
        );