diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-10 20:29:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-10 20:29:00 +0100 |
| commit | 320a74efb8d9c8aacded2799459a92d5b7235d90 (patch) | |
| tree | 1f547cb3cde20bd025dabddc6209390e22826b6a /src/lib/subtitle_decoder.cc | |
| parent | 623f3c66821d6a99bf0e683a8072b99a168f3a1c (diff) | |
Make subtitles work at least a bit.
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
| -rw-r--r-- | src/lib/subtitle_decoder.cc | 8 |
1 files changed, 3 insertions, 5 deletions
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 <boost/shared_ptr.hpp> #include "subtitle_decoder.h" -#include "subtitle.h" using boost::shared_ptr; @@ -31,11 +30,10 @@ SubtitleDecoder::SubtitleDecoder (shared_ptr<const Film> 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<TimedSubtitle> s) +SubtitleDecoder::subtitle (shared_ptr<Image> image, dcpomatic::Rect<double> rect, Time from, Time to) { - Subtitle (s); + Subtitle (image, rect, from, to); } |
