/*
- Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#ifndef DCPOMATIC_SUBTITLE_DECODER_H
-#define DCPOMATIC_SUBTITLE_DECODER_H
+#ifndef DCPOMATIC_CAPTION_DECODER_H
+#define DCPOMATIC_CAPTION_DECODER_H
#include "decoder.h"
#include "rect.h"
TextDecoder (
Decoder* parent,
boost::shared_ptr<const TextContent>,
- boost::shared_ptr<Log> log,
ContentTime first
);
- ContentTime position () const {
+ ContentTime position (boost::shared_ptr<const Film>) const {
return _position;
}
void emit_bitmap_start (ContentTime from, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
+ void emit_bitmap (ContentTimePeriod period, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
void emit_plain_start (ContentTime from, std::list<dcp::SubtitleString> s);
void emit_plain_start (ContentTime from, sub::Subtitle const & subtitle);
void emit_plain (ContentTimePeriod period, std::list<dcp::SubtitleString> s);
}
boost::signals2::signal<void (ContentBitmapText)> BitmapStart;
- boost::signals2::signal<void (ContentPlainText)> PlainStart;
- boost::signals2::signal<void (ContentTime, TextType)> Stop;
+ boost::signals2::signal<void (ContentStringText)> PlainStart;
+ boost::signals2::signal<void (ContentTime)> Stop;
private:
boost::shared_ptr<const TextContent> _content;