X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Frender_text.h;h=0a8e97bc964ba220757844950d88a64663dbc3d7;hp=0f3a31e211277c78fbb8d9e349f7d1d58338555f;hb=9cb73fbc0fa4643612f01665bc6d9fc430656f32;hpb=d3c009991a782fa51e85828c7600994a9dd91559 diff --git a/src/lib/render_text.h b/src/lib/render_text.h index 0f3a31e21..0a8e97bc9 100644 --- a/src/lib/render_text.h +++ b/src/lib/render_text.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2016 Carl Hetherington + Copyright (C) 2014-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -20,12 +20,12 @@ #include "position_image.h" #include "dcpomatic_time.h" -#include "subtitle_string.h" +#include "text_caption.h" #include class Font; -std::string marked_up (std::list subtitles, int target_height, float fade_factor); +std::string marked_up (std::list subtitles, int target_height, float fade_factor); std::list render_text ( - std::list, std::list > fonts, dcp::Size, DCPTime, int + std::list, std::list > fonts, dcp::Size, DCPTime, int );