Remember the last directory used when opening DCPs in the player (#1121).

[dcpomatic.git] / src / lib / text_subtitle_decoder.cc

diff --git a/src/lib/text_subtitle_decoder.cc b/src/lib/text_subtitle_decoder.cc
index baa5a03a0fcbb23cc690004e6a667c412e32184f..846c3016ee1748f8c97aa08b27a1232ed3a8ec57 100644 (file)
--- a/src/lib/text_subtitle_decoder.cc
+++ b/src/lib/text_subtitle_decoder.cc
@@ -34,24 +34,25 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 
-TextSubtitleDecoder::TextSubtitleDecoder (shared_ptr<const TextSubtitleContent> content)
+TextSubtitleDecoder::TextSubtitleDecoder (shared_ptr<const TextSubtitleContent> content, shared_ptr<Log> log)
        : TextSubtitle (content)
        , _next (0)
 {
-       subtitle.reset (
-               new SubtitleDecoder (
-                       this,
-                       content->subtitle,
-                       bind (&TextSubtitleDecoder::image_subtitles_during, this, _1, _2),
-                       bind (&TextSubtitleDecoder::text_subtitles_during, this, _1, _2)
-                       )
-               );
+       subtitle.reset (new SubtitleDecoder (this, content->subtitle, log));
 }
 
 void
 TextSubtitleDecoder::seek (ContentTime time, bool accurate)
 {
-       subtitle->seek (time, accurate);
+       /* It's worth back-tracking a little here as decoding is cheap and it's nice if we don't miss
+          too many subtitles when seeking.
+       */
+       time -= ContentTime::from_seconds (5);
+       if (time < ContentTime()) {
+               time = ContentTime();
+       }
+
+       Decoder::seek (time, accurate);
 
        _next = 0;
        while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
@@ -60,84 +61,19 @@ TextSubtitleDecoder::seek (ContentTime time, bool accurate)
 }
 
 bool
-TextSubtitleDecoder::pass (PassReason, bool)
+TextSubtitleDecoder::pass ()
 {
        if (_next >= _subtitles.size ()) {
                return true;
        }
 
-       /* XXX: we are ignoring positioning specified in the file */
-
-       list<dcp::SubtitleString> out;
-
-       /* Highest line index in this subtitle */
-       int highest = 0;
-       BOOST_FOREACH (sub::Line i, _subtitles[_next].lines) {
-               DCPOMATIC_ASSERT (i.vertical_position.reference && i.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE);
-               DCPOMATIC_ASSERT (i.vertical_position.line);
-               highest = max (highest, i.vertical_position.line.get());
-       }
-
-       BOOST_FOREACH (sub::Line i, _subtitles[_next].lines) {
-               BOOST_FOREACH (sub::Block j, i.blocks) {
-                       out.push_back (
-                               dcp::SubtitleString (
-                                       TextSubtitleContent::font_id,
-                                       j.italic,
-                                       j.bold,
-                                       /* force the colour to whatever is configured */
-                                       subtitle->content()->colour(),
-                                       j.font_size.points (72 * 11),
-                                       1.0,
-                                       dcp::Time (_subtitles[_next].from.all_as_seconds(), 1000),
-                                       dcp::Time (_subtitles[_next].to.all_as_seconds(), 1000),
-                                       0,
-                                       dcp::HALIGN_CENTER,
-                                       /* This 1.015 is an arbitrary value to lift the bottom sub off the bottom
-                                          of the screen a bit to a pleasing degree.
-                                       */
-                                       1.015 - ((1 + highest - i.vertical_position.line.get()) * 1.5 / 22),
-                                       dcp::VALIGN_TOP,
-                                       dcp::DIRECTION_LTR,
-                                       j.text,
-                                       subtitle->content()->outline() ? dcp::BORDER : dcp::NONE,
-                                       subtitle->content()->outline_colour(),
-                                       dcp::Time (0, 1000),
-                                       dcp::Time (0, 1000)
-                                       )
-                               );
-               }
-       }
-
-       subtitle->give_text (content_time_period (_subtitles[_next]), out);
+       ContentTimePeriod const p = content_time_period (_subtitles[_next]);
+       subtitle->emit_text (p, _subtitles[_next]);
 
        ++_next;
        return false;
 }
 
-list<ContentTimePeriod>
-TextSubtitleDecoder::image_subtitles_during (ContentTimePeriod, bool) const
-{
-       return list<ContentTimePeriod> ();
-}
-
-list<ContentTimePeriod>
-TextSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
-{
-       /* XXX: inefficient */
-
-       list<ContentTimePeriod> d;
-
-       for (vector<sub::Subtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-               ContentTimePeriod t = content_time_period (*i);
-               if ((starting && p.contains (t.from)) || (!starting && p.overlaps (t))) {
-                       d.push_back (t);
-               }
-       }
-
-       return d;
-}
-
 ContentTimePeriod
 TextSubtitleDecoder::content_time_period (sub::Subtitle s) const
 {