Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

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

diff --git a/src/lib/render_subtitles.h b/src/lib/render_subtitles.h
index d83dc119a0d0a27de01e69eb6e9c957e098d5759..281efe97afcb3649cf01451a91542c33d62179ce 100644 (file)
--- a/src/lib/render_subtitles.h
+++ b/src/lib/render_subtitles.h
@@ -1,24 +1,28 @@
 /*
-    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 <dcp/util.h>
-#include "position_image.h"
 
-PositionImage render_subtitles (std::list<dcp::SubtitleString>, dcp::Size);
+class Font;
+
+std::string marked_up (std::list<dcp::SubtitleString> subtitles);
+std::list<PositionImage> render_subtitles (std::list<dcp::SubtitleString>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size);