projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put subtitle language back into content from the film (#1930).
[dcpomatic.git]
/
src
/
lib
/
render_text.h
diff --git
a/src/lib/render_text.h
b/src/lib/render_text.h
index 0f3a31e211277c78fbb8d9e349f7d1d58338555f..d1c8c7aee9b357be8252f86ba26b7821af634b2a 100644
(file)
--- a/
src/lib/render_text.h
+++ b/
src/lib/render_text.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-201
8
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-20,12
+20,14
@@
#include "position_image.h"
#include "dcpomatic_time.h"
#include "position_image.h"
#include "dcpomatic_time.h"
-#include "s
ubtitle_string
.h"
+#include "s
tring_text
.h"
#include <dcp/util.h>
#include <dcp/util.h>
-class Font;
+namespace dcpomatic {
+ class Font;
+}
-std::string marked_up (std::list<S
ubtitleString
> subtitles, int target_height, float fade_factor);
+std::string marked_up (std::list<S
tringText
> subtitles, int target_height, float fade_factor);
std::list<PositionImage> render_text (
std::list<PositionImage> render_text (
- std::list<S
ubtitleString>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size,
DCPTime, int
+ std::list<S
tringText>, std::list<std::shared_ptr<dcpomatic::Font> > fonts, dcp::Size, dcpomatic::
DCPTime, int
);
);