summaryrefslogtreecommitdiff
path: root/src/wx/subtitle_view.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-19 22:44:53 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-19 23:45:23 +0100
commit27b83475435dda4e84a90cf59a52f150905c4ab1 (patch)
tree51d0158c7a879f6b2f3c40843c5e5e455069a1dc /src/wx/subtitle_view.cc
parent9cb73fbc0fa4643612f01665bc6d9fc430656f32 (diff)
Clean up after previous commit.
Diffstat (limited to 'src/wx/subtitle_view.cc')
-rw-r--r--src/wx/subtitle_view.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc
index f33d6eddf..6d34a93db 100644
--- a/src/wx/subtitle_view.cc
+++ b/src/wx/subtitle_view.cc
@@ -19,13 +19,13 @@
*/
#include "lib/text_caption_file_decoder.h"
-#include "lib/content_text.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/text_caption_file_content.h"
-#include "lib/text_decoder.h"
+#include "lib/caption_decoder.h"
#include "subtitle_view.h"
#include "film_viewer.h"
#include "wx_util.h"
@@ -85,8 +85,8 @@ 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);
}