projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix missing subtitles when they start just after the start of a frame.
[dcpomatic.git]
/
src
/
lib
/
render_subtitles.h
diff --git
a/src/lib/render_subtitles.h
b/src/lib/render_subtitles.h
index 79194568a9211511da7a675ba5404758d47b073a..b1239bb3d3d6b8677abaadb77fb62fd9c2973aa7 100644
(file)
--- a/
src/lib/render_subtitles.h
+++ b/
src/lib/render_subtitles.h
@@
-20,12
+20,12
@@
#include "position_image.h"
#include "dcpomatic_time.h"
#include "position_image.h"
#include "dcpomatic_time.h"
-#include
<dcp/subtitle_string.h>
+#include
"subtitle_string.h"
#include <dcp/util.h>
class Font;
#include <dcp/util.h>
class Font;
-std::string marked_up (std::list<
dcp::SubtitleString> subtitles
);
+std::string marked_up (std::list<
SubtitleString> subtitles, int target_height, float fade_factor
);
std::list<PositionImage> render_subtitles (
std::list<PositionImage> render_subtitles (
- std::list<
dcp::SubtitleString>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size, DCPTime
+ std::list<
SubtitleString>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size, DCPTime, int
);
);