Merge remote-tracking branch 'origin/master' into 2.0

[dcpomatic.git] / src / lib / player.cc

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);
                        }
                }