using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::bind;
+using namespace dcpomatic;
-DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content, shared_ptr<Log> log)
+DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
+ : Decoder (film)
{
shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
+ c->fix_empty_font_ids ();
_subtitles = c->subtitles ();
_next = _subtitles.begin ();
if (_next != _subtitles.end()) {
first = content_time_period(*_next).from;
}
- caption.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_caption(), log, first)));
+ text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first)));
}
void
/* 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 plain_text() call otherwise the
+ period with the same emit*() call otherwise the
TextDecoder will assume there is nothing else at the
- time of emit the first.
+ time of emitting the first.
*/
list<dcp::SubtitleString> s;
+ list<dcp::SubtitleImage> i;
ContentTimePeriod const p = content_time_period (*_next);
while (_next != _subtitles.end () && content_time_period (*_next) == p) {
if (ns) {
s.push_back (*ns);
++_next;
+ } else {
+ /* XXX: perhaps these image subs should also be collected together like the string ones are;
+ this would need to be done both here and in DCPDecoder.
+ */
+
+ shared_ptr<dcp::SubtitleImage> ni = dynamic_pointer_cast<dcp::SubtitleImage>(*_next);
+ if (ni) {
+ emit_subtitle_image (p, *ni, film()->frame_size(), only_text());
+ ++_next;
+ }
}
-
- /* XXX: image subtitles */
}
- only_caption()->emit_plain (p, s);
+ only_text()->emit_plain (p, s);
return false;
}