Don't show an error when cancelling subtitle analysis.

[dcpomatic.git] / src / wx / text_view.h

diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index 24641b2ab856d9d7b89f8e502fe32cceee477091..8cf3c78bbf580480270810723f06878204f50a47 100644 (file)
--- 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;
 };