X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_view.h;h=b44742b6313afeeb524454f59577fbdc4e8f0700;hb=cc2ca33dbf5aeab23d3e80d7b9cb8005daa1e1b2;hp=8cec8d28444b902701f241d6fc04a52b4bd01396;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index 8cec8d284..b44742b63 100644
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -19,30 +19,38 @@
 */
 
 #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>
 
 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 *,
+		std::shared_ptr<Film>,
+		std::shared_ptr<Content> content,
+		std::shared_ptr<TextContent> caption,
+		std::shared_ptr<Decoder>,
+		std::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;
-	boost::weak_ptr<Content> _content;
-	FilmViewer* _film_viewer;
+	std::vector<dcpomatic::ContentTime> _start_times;
+	std::weak_ptr<Content> _content;
+	std::weak_ptr<FilmViewer> _film_viewer;
 };