X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_view.h;h=8cf3c78bbf580480270810723f06878204f50a47;hb=e7d8a70a16f972de2861bb1464dec6df3d26c579;hp=24641b2ab856d9d7b89f8e502fe32cceee477091;hpb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;p=dcpomatic.git

diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index 24641b2ab..8cf3c78bb 100644
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -19,11 +19,11 @@
 */
 
 #include "lib/content_text.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 class Decoder;
 class FilmViewer;
@@ -38,7 +38,7 @@ public:
 		std::shared_ptr<Content> content,
 		std::shared_ptr<TextContent> caption,
 		std::shared_ptr<Decoder>,
-		std::weak_ptr<FilmViewer> viewer
+		FilmViewer& viewer
 		);
 
 private:
@@ -52,5 +52,5 @@ private:
 	boost::optional<int> _last_count;
 	std::vector<dcpomatic::ContentTime> _start_times;
 	std::weak_ptr<Content> _content;
-	std::weak_ptr<FilmViewer> _film_viewer;
+	FilmViewer& _film_viewer;
 };