diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-19 19:58:30 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:45:23 +0100 |
| commit | ae95d9cab28e414245e15ddeae20e96735594a8b (patch) | |
| tree | df35ddb480ee9aa7a34ff9831e2a3ee147a86fe7 /src/lib/player.cc | |
| parent | 507a389e9c5f84ec1d51e7566e38fbf42f658537 (diff) | |
Partial conversion of PlayerSubtitles -> PlayerText and SubtitleString -> PlainText.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 4c9e216e1..32c2dfdfd 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -663,7 +663,7 @@ Player::subtitles_for_frame (DCPTime time) const int const vfr = _film->video_frame_rate(); - BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_subtitles)) { + BOOST_FOREACH (PlayerText i, _active_subtitles.get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_subtitles)) { /* Image subtitles */ list<PositionImage> c = transform_bitmap_texts (i.image); @@ -858,7 +858,7 @@ Player::bitmap_text_start (weak_ptr<Piece> wp, ContentBitmapText subtitle) subtitle.sub.rectangle.width *= piece->content->subtitle->x_scale (); subtitle.sub.rectangle.height *= piece->content->subtitle->y_scale (); - PlayerSubtitles ps; + PlayerText ps; ps.image.push_back (subtitle.sub); DCPTime from (content_time_to_dcp (piece, subtitle.from())); @@ -873,7 +873,7 @@ Player::plain_text_start (weak_ptr<Piece> wp, ContentPlainText subtitle) return; } - PlayerSubtitles ps; + PlayerText ps; DCPTime const from (content_time_to_dcp (piece, subtitle.from())); if (from > piece->content->end()) { @@ -926,7 +926,7 @@ Player::subtitle_stop (weak_ptr<Piece> wp, ContentTime to) return; } - pair<PlayerSubtitles, DCPTime> from = _active_subtitles.add_to (wp, dcp_to); + pair<PlayerText, DCPTime> from = _active_subtitles.add_to (wp, dcp_to); if (piece->content->subtitle->use() && !_always_burn_subtitles && !piece->content->subtitle->burn()) { Subtitle (from.first, DCPTimePeriod (from.second, dcp_to)); |