Supporters update.

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

diff --git a/src/wx/markers_panel.h b/src/wx/markers_panel.h
index 23cc860c1dbcc74bb6e7144b8e8ecdb9c731a15c..3f43ee7d2662c9ae855299ff8e6ff8234ac31f79 100644 (file)
--- a/src/wx/markers_panel.h
+++ b/src/wx/markers_panel.h
@@ -20,7 +20,7 @@
 
 
 #include "lib/dcpomatic_time.h"
-#include "lib/film.h"
+#include "lib/film_property.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
@@ -34,7 +34,7 @@ class wxTipWindow;
 class MarkersPanel : public wxPanel
 {
 public:
-       MarkersPanel (wxWindow* parent, std::weak_ptr<FilmViewer> viewer);
+       MarkersPanel(wxWindow* parent, FilmViewer& viewer);
 
        void set_film (std::weak_ptr<Film> film);
 
@@ -47,7 +47,7 @@ private:
        void move_marker_to_current_position ();
        void remove_marker ();
        void add_marker (wxCommandEvent& ev);
-       void film_changed (ChangeType type, Film::Property property);
+       void film_changed(ChangeType type, FilmProperty property);
        void update_from_film (std::shared_ptr<Film> film);
 
        wxTipWindow* _tip = nullptr;
@@ -69,7 +69,7 @@ private:
        std::weak_ptr<Film> _film;
        std::map<dcp::Marker, Marker> _markers;
        boost::optional<dcp::Marker> _over;
-       std::weak_ptr<FilmViewer> _viewer;
+       FilmViewer& _viewer;
        boost::optional<dcp::Marker> _menu_marker;
 };