X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Frender_subtitles.h;h=02bf3ec656c45b6bb4409ac21a00fa4150321f3b;hb=188ae6711eaf9e231e8c07f85a6e8d1fee191ab6;hp=4fd931781abce82d15897f7b97bb6a9a3721b822;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/render_subtitles.h b/src/lib/render_subtitles.h index 4fd931781..02bf3ec65 100644 --- a/src/lib/render_subtitles.h +++ b/src/lib/render_subtitles.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2016 Carl Hetherington This file is part of DCP-o-matic. @@ -19,9 +19,13 @@ */ #include "position_image.h" -#include +#include "dcpomatic_time.h" +#include "subtitle_string.h" #include class Font; -std::list render_subtitles (std::list, std::list > fonts, dcp::Size); +std::string marked_up (std::list subtitles, int target_height, float fade_factor); +std::list render_subtitles ( + std::list, std::list > fonts, dcp::Size, DCPTime + );