X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.h;h=b532e74e3730989bb78124cc7a8cacf9e997dd86;hb=8c39f950ec8f8b3cf4d258279ab499d7e71dafc8;hp=84cb870f24209f6d055d84a490ac9848d2c5b096;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 84cb870f2..b532e74e3 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -24,8 +24,6 @@
 #include "lib/rect.h"
 #include "lib/film.h"
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
 
 class Film;
@@ -34,13 +32,14 @@ class TimelineView;
 class TimelineTimeAxisView;
 class TimelineReelsView;
 class TimelineLabelsView;
+class FilmViewer;
 
 class Timeline : public wxPanel
 {
 public:
-	Timeline (wxWindow *, ContentPanel *, boost::shared_ptr<Film>);
+	Timeline (wxWindow *, ContentPanel *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
 
-	boost::shared_ptr<const Film> film () const;
+	std::shared_ptr<const Film> film () const;
 
 	void force_redraw (dcpomatic::Rect<int> const &);
 
@@ -103,8 +102,9 @@ private:
 	void set_pixels_per_second (double pps);
 	void set_pixels_per_track (int h);
 	void zoom_all ();
+	void update_playhead ();
 
-	boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
+	std::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
 	TimelineContentViewList selected_views () const;
 	ContentList selected_content () const;
 	void maybe_snap (dcpomatic::DCPTime a, dcpomatic::DCPTime b, boost::optional<dcpomatic::DCPTime>& nearest_distance) const;
@@ -112,17 +112,18 @@ private:
 	wxScrolledCanvas* _labels_canvas;
 	wxScrolledCanvas* _main_canvas;
 	ContentPanel* _content_panel;
-	boost::weak_ptr<Film> _film;
+	std::weak_ptr<Film> _film;
+	std::weak_ptr<FilmViewer> _viewer;
 	TimelineViewList _views;
-	boost::shared_ptr<TimelineTimeAxisView> _time_axis_view;
-	boost::shared_ptr<TimelineReelsView> _reels_view;
-	boost::shared_ptr<TimelineLabelsView> _labels_view;
+	std::shared_ptr<TimelineTimeAxisView> _time_axis_view;
+	std::shared_ptr<TimelineReelsView> _reels_view;
+	std::shared_ptr<TimelineLabelsView> _labels_view;
 	int _tracks;
 	boost::optional<double> _pixels_per_second;
 	bool _left_down;
 	wxPoint _down_point;
 	boost::optional<wxPoint> _zoom_point;
-	boost::shared_ptr<TimelineContentView> _down_view;
+	std::shared_ptr<TimelineContentView> _down_view;
 	dcpomatic::DCPTime _down_view_position;
 	bool _first_move;
 	ContentMenu _menu;
@@ -134,6 +135,7 @@ private:
 	int _y_scroll_rate;
 	int _pixels_per_track;
 	bool _first_resize;
+	wxTimer _timer;
 
 	static double const _minimum_pixels_per_second;
 	static int const _minimum_pixels_per_track;