projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86cb57f
)
Apply subtitle scale (ish) to text subs; should help with #413.
author
Carl Hetherington
<cth@carlh.net>
Wed, 1 Oct 2014 23:26:35 +0000
(
00:26
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 1 Oct 2014 23:26:35 +0000
(
00:26
+0100)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 94bbf0c3d9b9c3cac552d19680ef34de4676a770..db99cd2ad81626bbe10180bc3e28ea9ea878cf43 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-576,6
+576,7
@@
Player::get_subtitles (DCPTime time, DCPTime length, bool starting)
BOOST_FOREACH (ContentTextSubtitle& ts, text) {
BOOST_FOREACH (dcp::SubtitleString& s, ts.subs) {
s.set_v_position (s.v_position() + subtitle_content->subtitle_y_offset ());
+ s.set_size (s.size() * max (subtitle_content->subtitle_x_scale(), subtitle_content->subtitle_y_scale()));
ps.text.push_back (s);
}
}