*/
-#include "lib/text_text_decoder.h"
-#include "lib/content_subtitle.h"
+#include "lib/text_caption_file_decoder.h"
+#include "lib/content_text.h"
#include "lib/video_decoder.h"
#include "lib/audio_decoder.h"
#include "lib/film.h"
#include "lib/config.h"
-#include "lib/text_text_content.h"
+#include "lib/text_caption_file_content.h"
+#include "lib/text_decoder.h"
#include "subtitle_view.h"
#include "film_viewer.h"
#include "wx_util.h"
_subs = 0;
_frc = film->active_frame_rate_change (content->position());
- decoder->subtitle->TextStart.connect (bind (&SubtitleView::data_start, this, _1));
+ decoder->subtitle->PlainStart.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)
+SubtitleView::data_start (ContentTextCaption cts)
{
BOOST_FOREACH (dcp::SubtitleString const & i, cts.subs) {
wxListItem list_item;