X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Frender_subtitles.h;h=02bf3ec656c45b6bb4409ac21a00fa4150321f3b;hb=936cd11b4c46f99ca5fe4d960cedfb05c82dbccf;hp=22e5885ddec9f923e3b17abfce8a8e6a097ce1a7;hpb=ea8d9e93091cd54d252b3c4069d1dba7060e4f75;p=dcpomatic.git

diff --git a/src/lib/render_subtitles.h b/src/lib/render_subtitles.h
index 22e5885dd..02bf3ec65 100644
--- a/src/lib/render_subtitles.h
+++ b/src/lib/render_subtitles.h
@@ -1,26 +1,31 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "position_image.h"
-#include <dcp/subtitle_string.h>
+#include "dcpomatic_time.h"
+#include "subtitle_string.h"
 #include <dcp/util.h>
 
 class Font;
 
-std::list<PositionImage> render_subtitles (std::list<dcp::SubtitleString>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size);
+std::string marked_up (std::list<SubtitleString> subtitles, int target_height, float fade_factor);
+std::list<PositionImage> render_subtitles (
+	std::list<SubtitleString>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size, DCPTime
+	);