X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fwx%2Ftext_view.h;h=d360838a834327ea5063d6d821dd1c6e65774691;hb=refs%2Ftags%2Fv2.15.100;hp=8cec8d28444b902701f241d6fc04a52b4bd01396;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index 8cec8d284..d360838a8 100644
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -19,30 +19,40 @@
 */
 
 #include "lib/content_text.h"
-#include <boost/shared_ptr.hpp>
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <wx/listctrl.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
 class Decoder;
 class FilmViewer;
+class Film;
 
 class TextView : public wxDialog
 {
 public:
 	TextView (
-		wxWindow *, boost::shared_ptr<Film>, boost::shared_ptr<Content> content, boost::shared_ptr<TextContent> caption, boost::shared_ptr<Decoder>, FilmViewer* viewer
+		wxWindow *,
+		boost::shared_ptr<Film>,
+		boost::shared_ptr<Content> content,
+		boost::shared_ptr<TextContent> caption,
+		boost::shared_ptr<Decoder>,
+		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;
-	FilmViewer* _film_viewer;
+	boost::weak_ptr<FilmViewer> _film_viewer;
 };