Clean up after previous commit.

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

diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc
index b2e74eb88b56d985e706f8cf4051a9d1eadaa15c..6d34a93db887796cb5e6c287611dc845354e4f90 100644 (file)
--- a/src/wx/subtitle_view.cc
+++ b/src/wx/subtitle_view.cc
@@ -18,14 +18,14 @@
 
 */
 
-#include "lib/plain_text_file_decoder.h"
-#include "lib/content_text.h"
+#include "lib/text_caption_file_decoder.h"
+#include "lib/content_caption.h"
 #include "lib/video_decoder.h"
 #include "lib/audio_decoder.h"
 #include "lib/film.h"
 #include "lib/config.h"
-#include "lib/plain_text_file_content.h"
-#include "lib/text_decoder.h"
+#include "lib/text_caption_file_content.h"
+#include "lib/caption_decoder.h"
 #include "subtitle_view.h"
 #include "film_viewer.h"
 #include "wx_util.h"
@@ -85,14 +85,14 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<
 
        _subs = 0;
        _frc = film->active_frame_rate_change (content->position());
-       decoder->subtitle->PlainStart.connect (bind (&SubtitleView::data_start, this, _1));
-       decoder->subtitle->Stop.connect (bind (&SubtitleView::data_stop, this, _1));
+       decoder->caption->PlainStart.connect (bind (&SubtitleView::data_start, this, _1));
+       decoder->caption->Stop.connect (bind (&SubtitleView::data_stop, this, _1));
        while (!decoder->pass ()) {}
        SetSizerAndFit (sizer);
 }
 
 void
-SubtitleView::data_start (ContentPlainText cts)
+SubtitleView::data_start (ContentTextCaption cts)
 {
        BOOST_FOREACH (dcp::SubtitleString const & i, cts.subs) {
                wxListItem list_item;