using boost::shared_ptr;
using boost::bind;
-DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
+DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content, shared_ptr<Log> log)
{
- subtitle.reset (
- new SubtitleDecoder (
- this,
- content->subtitle,
- bind (&DCPSubtitleDecoder::image_subtitles_during, this, _1, _2),
- bind (&DCPSubtitleDecoder::text_subtitles_during, this, _1, _2)
- )
- );
+ subtitle.reset (new SubtitleDecoder (this, content->subtitle, log));
shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
_subtitles = c->subtitles ();
void
DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
{
- subtitle->seek (time, accurate);
+ Decoder::seek (time, accurate);
_next = _subtitles.begin ();
list<dcp::SubtitleString>::const_iterator i = _subtitles.begin ();
}
bool
-DCPSubtitleDecoder::pass (PassReason, bool)
+DCPSubtitleDecoder::pass ()
{
if (_next == _subtitles.end ()) {
return true;
++_next;
}
- subtitle->give_text (p, s);
-
+ subtitle->emit_text (p, s);
return false;
}
-list<ContentTimePeriod>
-DCPSubtitleDecoder::image_subtitles_during (ContentTimePeriod, bool) const
-{
- return list<ContentTimePeriod> ();
-}
-
-list<ContentTimePeriod>
-DCPSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
-{
- /* XXX: inefficient */
-
- list<ContentTimePeriod> d;
-
- for (list<dcp::SubtitleString>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
- ContentTimePeriod period = content_time_period (*i);
- if ((starting && p.contains(period.from)) || (!starting && p.overlap(period))) {
- d.push_back (period);
- }
- }
-
- return d;
-}
-
ContentTimePeriod
DCPSubtitleDecoder::content_time_period (dcp::SubtitleString s) const
{