summaryrefslogtreecommitdiff
path: root/src/lib/player.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-05-22 14:57:56 +0100
committerCarl Hetherington <cth@carlh.net>2014-05-22 14:57:56 +0100
commitd342a1befa88cb3f23c7e3fccfd1edaeea968fed (patch)
treef566fa87d0de35f3f0c4d7e20752c83b8a5b9bce /src/lib/player.cc
parent85d343a420c4df1a08663c8afd3bdb73c8dfa985 (diff)
Add ContentTimePeriod class.
Diffstat (limited to 'src/lib/player.cc')
-rw-r--r--src/lib/player.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 4865073d7..b60dd8467 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -337,7 +337,7 @@ Player::content_to_player_video_frame (
ContentTime const from = dcp_to_content_subtitle (*i, time);
ContentTime const to = from + ContentTime::from_frames (1, content->video_frame_rate ());
- list<shared_ptr<ContentImageSubtitle> > image_subtitles = subtitle_decoder->get_image_subtitles (from, to);
+ list<shared_ptr<ContentImageSubtitle> > image_subtitles = subtitle_decoder->get_image_subtitles (ContentTimePeriod (from, to));
if (!image_subtitles.empty ()) {
list<PositionImage> im = process_content_image_subtitles (
subtitle_content,
@@ -348,7 +348,7 @@ Player::content_to_player_video_frame (
}
if (_burn_subtitles) {
- list<shared_ptr<ContentTextSubtitle> > text_subtitles = subtitle_decoder->get_text_subtitles (from, to);
+ list<shared_ptr<ContentTextSubtitle> > text_subtitles = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to));
if (!text_subtitles.empty ()) {
list<PositionImage> im = process_content_text_subtitles (text_subtitles);
copy (im.begin(), im.end(), back_inserter (sub_images));