using std::list;
using std::vector;
using std::string;
+using std::cout;
using boost::shared_ptr;
using boost::optional;
SubtitleDecoder::seek (time, accurate);
_next = 0;
- while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.metric().get().all_as_seconds ()) < time) {
+ while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
++_next;
}
}
bool
-SubRipDecoder::pass ()
+SubRipDecoder::pass (PassReason)
{
if (_next >= _subtitles.size ()) {
return true;
dcp::SubtitleString (
SubRipContent::font_id,
j->italic,
- dcp::Color (255, 255, 255),
- j->font_size,
- dcp::Time (rint (_subtitles[_next].from.metric().get().all_as_milliseconds() / 4)),
- dcp::Time (rint (_subtitles[_next].to.metric().get().all_as_milliseconds() / 4)),
+ dcp::Colour (255, 255, 255),
+ j->font_size.points (72 * 11),
+ dcp::Time (_subtitles[_next].from.all_as_seconds()),
+ dcp::Time (_subtitles[_next].to.all_as_seconds()),
i->vertical_position.line.get() * (1.5 / 22) + 0.8,
dcp::TOP,
j->text,
dcp::NONE,
- dcp::Color (255, 255, 255),
+ dcp::Colour (255, 255, 255),
0,
0
)
}
list<ContentTimePeriod>
-SubRipDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
+SubRipDecoder::image_subtitles_during (ContentTimePeriod, bool) const
+{
+ return list<ContentTimePeriod> ();
+}
+
+list<ContentTimePeriod>
+SubRipDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
{
/* XXX: inefficient */
for (vector<sub::Subtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
ContentTimePeriod t (
- ContentTime::from_seconds (i->from.metric().get().all_as_seconds()),
- ContentTime::from_seconds (i->to.metric().get().all_as_seconds())
+ ContentTime::from_seconds (i->from.all_as_seconds()),
+ ContentTime::from_seconds (i->to.all_as_seconds())
);
-
+
if ((starting && p.contains (t.from)) || (!starting && p.overlaps (t))) {
d.push_back (t);
}