Various fixes to push audio vaguely in the right direction.

[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 05bde829cb6237dcb4a02d7d14ff4ab6372278bf..bdec17a8dba0a7ad386ba9f3b2e676ca881d7885 100644 (file)
--- a/src/lib/text_subtitle_decoder.cc
+++ b/src/lib/text_subtitle_decoder.cc
@@ -34,24 +34,17 @@ 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);
+       Decoder::seek (time, accurate);
 
        _next = 0;
        while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
@@ -60,51 +53,19 @@ TextSubtitleDecoder::seek (ContentTime time, bool accurate)
 }
 
 bool
-TextSubtitleDecoder::pass (PassReason, bool)
+TextSubtitleDecoder::pass ()
 {
        if (_next >= _subtitles.size ()) {
                return true;
        }
 
-       subtitle->give_text (content_time_period (_subtitles[_next]), _subtitles[_next]);
+       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;
-
-       /* Only take `during' (not starting) subs if they overlap more than half the requested period;
-          here's the threshold for being significant.
-       */
-       ContentTime const significant (p.duration().get() / 2);
-
-       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)) {
-                       d.push_back (t);
-               } else if (!starting) {
-                       optional<ContentTimePeriod> const o = p.overlap (t);
-                       if (o && o->duration() > significant) {
-                               d.push_back (t);
-                       }
-               }
-       }
-
-       return d;
-}
-
 ContentTimePeriod
 TextSubtitleDecoder::content_time_period (sub::Subtitle s) const
 {
@@ -113,9 +74,3 @@ TextSubtitleDecoder::content_time_period (sub::Subtitle s) const
                ContentTime::from_seconds (s.to.all_as_seconds())
                );
 }
-
-void
-TextSubtitleDecoder::reset ()
-{
-       subtitle->reset ();
-}