X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_view.h;h=b44742b6313afeeb524454f59577fbdc4e8f0700;hb=c6df41f00083b4c34d4993c981cdac97b76eeb95;hp=1fe07a99919f14b588edcc37ffe69351d02aad85;hpb=c370a1f38215f6461cf4366e6885757e7aa2b96a;p=dcpomatic.git

diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index 1fe07a999..b44742b63 100644
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -19,10 +19,11 @@
 */
 
 #include "lib/content_text.h"
+#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;
@@ -33,23 +34,23 @@ 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>,
-		boost::weak_ptr<FilmViewer> viewer
+		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;
-	boost::weak_ptr<FilmViewer> _film_viewer;
+	std::vector<dcpomatic::ContentTime> _start_times;
+	std::weak_ptr<Content> _content;
+	std::weak_ptr<FilmViewer> _film_viewer;
 };