summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-19 13:44:59 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-19 23:45:23 +0100
commit491176352b80bea000564e6662738722185be721 (patch)
tree34211a43cefdec49f43b4a990897fdb4102a5aa2 /src/wx
parent0fb9916d6734dbea4cb55b6d42923468aee45a40 (diff)
Remove old content_subtitle.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/subtitle_view.cc4
-rw-r--r--src/wx/subtitle_view.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc
index 41bf4b049..a3d06106c 100644
--- a/src/wx/subtitle_view.cc
+++ b/src/wx/subtitle_view.cc
@@ -19,7 +19,7 @@
*/
#include "lib/plain_text_decoder.h"
-#include "lib/content_subtitle.h"
+#include "lib/content_text.h"
#include "lib/video_decoder.h"
#include "lib/audio_decoder.h"
#include "lib/film.h"
@@ -91,7 +91,7 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<
}
void
-SubtitleView::data_start (ContentTextSubtitle cts)
+SubtitleView::data_start (ContentPlainText cts)
{
BOOST_FOREACH (dcp::SubtitleString const & i, cts.subs) {
wxListItem list_item;
diff --git a/src/wx/subtitle_view.h b/src/wx/subtitle_view.h
index 94ef52171..7272c608c 100644
--- a/src/wx/subtitle_view.h
+++ b/src/wx/subtitle_view.h
@@ -18,7 +18,7 @@
*/
-#include "lib/content_subtitle.h"
+#include "lib/content_text.h"
#include <boost/shared_ptr.hpp>
#include <wx/wx.h>
#include <wx/listctrl.h>
@@ -32,7 +32,7 @@ public:
SubtitleView (wxWindow *, boost::shared_ptr<Film>, boost::shared_ptr<Content> content, boost::shared_ptr<Decoder>, FilmViewer* viewer);
private:
- void data_start (ContentTextSubtitle cts);
+ void data_start (ContentPlainText cts);
void data_stop (ContentTime time);
void subtitle_selected (wxListEvent &);