Fix build.

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

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 041970d1639f2ce66dabe54c0ad8cf23e40b7718..2485e835fa8e4faa235d605d53371d5a09d8d5e7 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -18,15 +18,15 @@
 
 */
 
+
 #include "content_menu.h"
 #include "timeline_content_view.h"
-#include "lib/film.h"
+#include "lib/film_property.h"
 #include "lib/rect.h"
-#include "lib/util.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
@@ -42,7 +42,7 @@ class TimelineView;
 class Timeline : public wxPanel
 {
 public:
-       Timeline (wxWindow *, ContentPanel *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
+       Timeline (wxWindow *, ContentPanel *, std::shared_ptr<Film>, FilmViewer& viewer);
 
        std::shared_ptr<const Film> film () const;
 
@@ -82,6 +82,8 @@ public:
 
        int tracks_y_offset () const;
 
+       void keypress(wxKeyEvent const &);
+
 private:
        void paint_labels ();
        void paint_main ();
@@ -95,7 +97,7 @@ private:
        void mouse_moved (wxMouseEvent &);
        void mouse_moved_select (wxMouseEvent &);
        void mouse_moved_zoom (wxMouseEvent &);
-       void film_change (ChangeType type, Film::Property);
+       void film_change(ChangeType type, FilmProperty);
        void film_content_change (ChangeType type, int, bool frequent);
        void resized ();
        void assign_tracks ();
@@ -118,7 +120,7 @@ private:
        wxScrolledCanvas* _main_canvas;
        ContentPanel* _content_panel;
        std::weak_ptr<Film> _film;
-       std::weak_ptr<FilmViewer> _viewer;
+       FilmViewer& _viewer;
        TimelineViewList _views;
        std::shared_ptr<TimelineTimeAxisView> _time_axis_view;
        std::shared_ptr<TimelineReelsView> _reels_view;