Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / wx / subtitle_view.cc

diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc
index a4218dc5d7f64658e2c19a9537ee6a2cf0f73df3..bf839137112bf14ff4ade339906ea56f6bba8a9d 100644 (file)
--- a/src/wx/subtitle_view.cc
+++ b/src/wx/subtitle_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,6 +20,8 @@
 
 #include "lib/text_subtitle_decoder.h"
 #include "lib/content_subtitle.h"
+#include "lib/video_decoder.h"
+#include "lib/audio_decoder.h"
 #include "lib/film.h"
 #include "lib/text_subtitle_content.h"
 #include "subtitle_view.h"
@@ -67,25 +69,44 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<
                sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
        }
 
-#if 0
-       XXX
-
-       list<ContentTextSubtitle> subs = decoder->subtitle->get_text (ContentTimePeriod (ContentTime(), ContentTime::max ()), true, true);
-       FrameRateChange const frc = film->active_frame_rate_change (position);
-       int n = 0;
-       for (list<ContentTextSubtitle>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
-               for (list<dcp::SubtitleString>::const_iterator j = i->subs.begin(); j != i->subs.end(); ++j) {
-                       wxListItem list_item;
-                       list_item.SetId (n);
-                       _list->InsertItem (list_item);
-                       ContentTimePeriod const p = i->period ();
-                       _list->SetItem (n, 0, std_to_wx (p.from.timecode (frc.source)));
-                       _list->SetItem (n, 1, std_to_wx (p.to.timecode (frc.source)));
-                       _list->SetItem (n, 2, std_to_wx (j->text ()));
-                       ++n;
-               }
+       if (decoder->video) {
+               decoder->video->set_ignore (true);
+       }
+       if (decoder->audio) {
+               decoder->audio->set_ignore (true);
        }
-#endif
 
+       _subs = 0;
+       _frc = film->active_frame_rate_change (position);
+       decoder->subtitle->TextStart.connect (bind (&SubtitleView::data_start, this, _1));
+       decoder->subtitle->Stop.connect (bind (&SubtitleView::data_stop, this, _1));
+       while (!decoder->pass ()) {}
        SetSizerAndFit (sizer);
 }
+
+void
+SubtitleView::data_start (ContentTextSubtitle cts)
+{
+       BOOST_FOREACH (dcp::SubtitleString const & i, cts.subs) {
+               wxListItem list_item;
+               list_item.SetId (_subs);
+               _list->InsertItem (list_item);
+               _list->SetItem (_subs, 0, std_to_wx (cts.from().timecode (_frc->source)));
+               _list->SetItem (_subs, 2, std_to_wx (i.text ()));
+               ++_subs;
+       }
+
+       _last_count = cts.subs.size ();
+}
+
+void
+SubtitleView::data_stop (ContentTime time)
+{
+       if (!_last_count) {
+               return;
+       }
+
+       for (int i = _subs - *_last_count; i < _subs; ++i) {
+               _list->SetItem (i, 1, std_to_wx (time.timecode (_frc->source)));
+       }
+}