X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_view.h;h=8cf3c78bbf580480270810723f06878204f50a47;hb=7a301e22de2a3c47a81ebc4c9f19b68131b482aa;hp=d360838a834327ea5063d6d821dd1c6e65774691;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d;p=dcpomatic.git

diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index d360838a8..8cf3c78bb 100644
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -19,13 +19,11 @@
 */
 
 #include "lib/content_text.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 
 class Decoder;
 class FilmViewer;
@@ -36,11 +34,11 @@ 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>,
+		FilmViewer& viewer
 		);
 
 private:
@@ -53,6 +51,6 @@ private:
 	boost::optional<FrameRateChange> _frc;
 	boost::optional<int> _last_count;
 	std::vector<dcpomatic::ContentTime> _start_times;
-	boost::weak_ptr<Content> _content;
-	boost::weak_ptr<FilmViewer> _film_viewer;
+	std::weak_ptr<Content> _content;
+	FilmViewer& _film_viewer;
 };