X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=10c92c0736eb87385b5d4e0e20f88ba95c473f43;hb=c0d2b454ea1e8c9b047907343c902d72101ef6dd;hp=7dcaf68b745267be818b790009bd8116e95a923e;hpb=4aa2c70aa6b240d426f782b215749bee7399d6c4;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 7dcaf68b7..10c92c073 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -183,6 +183,7 @@ Player::playlist_content_changed (weak_ptr w, int property, bool freque } else if ( property == SubtitleContentProperty::LINE_SPACING || + property == SubtitleContentProperty::OUTLINE_WIDTH || property == SubtitleContentProperty::Y_SCALE ) { @@ -337,7 +338,7 @@ Player::get_video (DCPTime time, bool accurate) /* Text subtitles (rendered to an image) */ if (!ps.text.empty ()) { - list s = render_subtitles (ps.text, ps.fonts, _video_container_size); + list s = render_subtitles (ps.text, ps.fonts, _video_container_size, time); copy (s.begin (), s.end (), back_inserter (sub_images)); } @@ -648,7 +649,7 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt, } s.set_in (dcp::Time(content_subtitle_to_dcp (*j, ts.period().from).seconds(), 1000)); s.set_out (dcp::Time(content_subtitle_to_dcp (*j, ts.period().to).seconds(), 1000)); - ps.text.push_back (s); + ps.text.push_back (SubtitleString (s, (*j)->content->subtitle->outline_width())); ps.add_fonts ((*j)->content->subtitle->fonts ()); } }