/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "dcp_subtitle_decoder.h"
#include "dcp_subtitle_content.h"
#include <dcp/interop_subtitle_asset.h>
+#include <iostream>
using std::list;
using std::cout;
using boost::shared_ptr;
+using boost::bind;
DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
- : SubtitleDecoder (content)
{
+ subtitle.reset (
+ new SubtitleDecoder (
+ this,
+ content->subtitle,
+ bind (&DCPSubtitleDecoder::image_subtitles_during, this, _1, _2),
+ bind (&DCPSubtitleDecoder::text_subtitles_during, this, _1, _2)
+ )
+ );
+
shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
_subtitles = c->subtitles ();
_next = _subtitles.begin ();
void
DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
{
- SubtitleDecoder::seek (time, accurate);
+ subtitle->seek (time, accurate);
_next = _subtitles.begin ();
list<dcp::SubtitleString>::const_iterator i = _subtitles.begin ();
}
bool
-DCPSubtitleDecoder::pass ()
+DCPSubtitleDecoder::pass (PassReason, bool)
{
if (_next == _subtitles.end ()) {
return true;
}
+ /* Gather all subtitles with the same time period that are next
+ on the list. We must emit all subtitles for the same time
+ period with the same text_subtitle() call otherwise the
+ SubtitleDecoder will assume there is nothing else at the
+ time of emit the first.
+ */
+
list<dcp::SubtitleString> s;
- s.push_back (*_next);
- text_subtitle (content_time_period (*_next), s);
- ++_next;
+ ContentTimePeriod const p = content_time_period (*_next);
+
+ while (_next != _subtitles.end () && content_time_period (*_next) == p) {
+ s.push_back (*_next);
+ ++_next;
+ }
+
+ subtitle->text_subtitle (p, s);
return false;
}