X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_view.h;h=6ce22dc799dfa9f579b733a0a023faf2bc10a1f9;hb=c0a609b31bbf69d1fafcc734ac4f825933703d23;hp=12cbb6d088a58e54777c2f2611c313ed119d92a7;hpb=23583dfb56181c76126e652042e9d1940367aa27;p=dcpomatic.git

diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index 12cbb6d08..6ce22dc79 100644
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -19,12 +19,14 @@
 */
 
 #include "lib/content_text.h"
-#include <boost/shared_ptr.hpp>
 #include <wx/wx.h>
 #include <wx/listctrl.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
 class Decoder;
-class ControlFilmViewer;
+class FilmViewer;
+class Film;
 
 class TextView : public wxDialog
 {
@@ -35,19 +37,19 @@ public:
 		boost::shared_ptr<Content> content,
 		boost::shared_ptr<TextContent> caption,
 		boost::shared_ptr<Decoder>,
-		ControlFilmViewer* viewer
+		boost::weak_ptr<FilmViewer> viewer
 		);
 
 private:
 	void data_start (ContentStringText cts);
-	void data_stop (ContentTime time);
+	void data_stop (dcpomatic::ContentTime time);
 	void subtitle_selected (wxListEvent &);
 
 	wxListCtrl* _list;
 	int _subs;
 	boost::optional<FrameRateChange> _frc;
 	boost::optional<int> _last_count;
-	std::vector<ContentTime> _start_times;
+	std::vector<dcpomatic::ContentTime> _start_times;
 	boost::weak_ptr<Content> _content;
-	ControlFilmViewer* _film_viewer;
+	boost::weak_ptr<FilmViewer> _film_viewer;
 };