projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup variable name: a -> reel_assets
[dcpomatic.git]
/
src
/
lib
/
render_text.h
diff --git
a/src/lib/render_text.h
b/src/lib/render_text.h
index 0a8e97bc964ba220757844950d88a64663dbc3d7..07a97bb4047ca90ca6fe5559b7b964e7f50e3a3c 100644
(file)
--- a/
src/lib/render_text.h
+++ b/
src/lib/render_text.h
@@
-20,12
+20,14
@@
#include "position_image.h"
#include "dcpomatic_time.h"
#include "position_image.h"
#include "dcpomatic_time.h"
-#include "
text_caption
.h"
+#include "
string_text
.h"
#include <dcp/util.h>
#include <dcp/util.h>
-class Font;
+namespace dcpomatic {
+ class Font;
+}
-std::string marked_up (std::list<
TextCaption> subtitles, int target_height, float fade_factor
);
+std::string marked_up (std::list<
StringText> subtitles, int target_height, float fade_factor, std::string font_name
);
std::list<PositionImage> render_text (
std::list<PositionImage> render_text (
- std::list<
TextCaption>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size,
DCPTime, int
+ std::list<
StringText>, std::list<std::shared_ptr<dcpomatic::Font> > fonts, dcp::Size, dcpomatic::
DCPTime, int
);
);