From 320a74efb8d9c8aacded2799459a92d5b7235d90 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 10 Jul 2013 20:29:00 +0100 Subject: Make subtitles work at least a bit. --- src/lib/subtitle_decoder.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/lib/subtitle_decoder.cc') diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index 0ffe5e501..c06f3d718 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -19,7 +19,6 @@ #include #include "subtitle_decoder.h" -#include "subtitle.h" using boost::shared_ptr; @@ -31,11 +30,10 @@ SubtitleDecoder::SubtitleDecoder (shared_ptr f) /** Called by subclasses when a subtitle is ready. - * s may be 0 to say that there is no current subtitle. - * @param s New current subtitle, or 0. + * Image may be 0 to say that there is no current subtitle. */ void -SubtitleDecoder::subtitle (shared_ptr s) +SubtitleDecoder::subtitle (shared_ptr image, dcpomatic::Rect rect, Time from, Time to) { - Subtitle (s); + Subtitle (image, rect, from, to); } -- cgit v1.2.3