Various fixes to push audio vaguely in the right direction.

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

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index fe383226ee7a33f27a474248feba3c9077bd13f3..04b264192cd9d43c184449820b9c16213118ed28 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -28,16 +28,9 @@ using std::cout;
 using boost::shared_ptr;
 using boost::bind;
 
-DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
+DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content, shared_ptr<Log> log)
 {
-       subtitle.reset (
-               new SubtitleDecoder (
-                       this,
-                       content->subtitle,
-                       bind (&DCPSubtitleDecoder::image_subtitles_during, this, _1, _2),
-                       bind (&DCPSubtitleDecoder::text_subtitles_during, this, _1, _2)
-                       )
-               );
+       subtitle.reset (new SubtitleDecoder (this, content->subtitle, log));
 
        shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
        _subtitles = c->subtitles ();
@@ -47,7 +40,7 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> con
 void
 DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 {
-       subtitle->seek (time, accurate);
+       Decoder::seek (time, accurate);
 
        _next = _subtitles.begin ();
        list<dcp::SubtitleString>::const_iterator i = _subtitles.begin ();
@@ -57,7 +50,7 @@ DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 }
 
 bool
-DCPSubtitleDecoder::pass (PassReason, bool)
+DCPSubtitleDecoder::pass ()
 {
        if (_next == _subtitles.end ()) {
                return true;
@@ -78,38 +71,10 @@ DCPSubtitleDecoder::pass (PassReason, bool)
                ++_next;
        }
 
-       subtitle->give_text (p, s);
-       subtitle->set_position (p.from);
-
+       subtitle->emit_text (p, s);
        return false;
 }
 
-list<ContentTimePeriod>
-DCPSubtitleDecoder::image_subtitles_during (ContentTimePeriod, bool) const
-{
-       return list<ContentTimePeriod> ();
-}
-
-list<ContentTimePeriod>
-DCPSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
-{
-       /* XXX: inefficient */
-
-       list<ContentTimePeriod> d;
-
-       for (list<dcp::SubtitleString>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-               ContentTimePeriod period = content_time_period (*i);
-               if ((starting && p.contains(period.from)) || (!starting && p.overlap(period))) {
-                       d.push_back (period);
-               }
-       }
-
-       d.sort ();
-       d.unique ();
-
-       return d;
-}
-
 ContentTimePeriod
 DCPSubtitleDecoder::content_time_period (dcp::SubtitleString s) const
 {