X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ftimeline.h;h=ef887dab8242878563dde77e08dd4a53d32d4caf;hb=0a3f387f5d39da2ca38ec90a9593c1b598040dd7;hp=9f3a4a47b6a7ead9aa7f4ac003cabc70fadc21f3;hpb=6c7489e5d778d3e71065d88a094a7383ba2c117d;p=dcpomatic.git

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 9f3a4a47b..ef887dab8 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -34,11 +34,12 @@ 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 *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
 
 	boost::shared_ptr<const Film> film () const;
 
@@ -91,11 +92,11 @@ private:
 	void mouse_moved (wxMouseEvent &);
 	void mouse_moved_select (wxMouseEvent &);
 	void mouse_moved_zoom (wxMouseEvent &);
-	void film_changed (Film::Property);
+	void film_change (ChangeType type, Film::Property);
 	void film_content_change (ChangeType type, int, bool frequent);
 	void resized ();
 	void assign_tracks ();
-	void set_position_from_event (wxMouseEvent &);
+	void set_position_from_event (wxMouseEvent& ev, bool force_emit = false);
 	void clear_selection ();
 	void recreate_views ();
 	void setup_scrollbars ();
@@ -103,16 +104,18 @@ private:
 	void set_pixels_per_second (double pps);
 	void set_pixels_per_track (int h);
 	void zoom_all ();
+	void position_change ();
 
 	boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
 	TimelineContentViewList selected_views () const;
 	ContentList selected_content () const;
-	void maybe_snap (DCPTime a, DCPTime b, boost::optional<DCPTime>& nearest_distance) const;
+	void maybe_snap (dcpomatic::DCPTime a, dcpomatic::DCPTime b, boost::optional<dcpomatic::DCPTime>& nearest_distance) const;
 
 	wxScrolledCanvas* _labels_canvas;
 	wxScrolledCanvas* _main_canvas;
 	ContentPanel* _content_panel;
 	boost::weak_ptr<Film> _film;
+	boost::weak_ptr<FilmViewer> _viewer;
 	TimelineViewList _views;
 	boost::shared_ptr<TimelineTimeAxisView> _time_axis_view;
 	boost::shared_ptr<TimelineReelsView> _reels_view;
@@ -123,12 +126,12 @@ private:
 	wxPoint _down_point;
 	boost::optional<wxPoint> _zoom_point;
 	boost::shared_ptr<TimelineContentView> _down_view;
-	DCPTime _down_view_position;
+	dcpomatic::DCPTime _down_view_position;
 	bool _first_move;
 	ContentMenu _menu;
 	bool _snap;
-	std::list<DCPTime> _start_snaps;
-	std::list<DCPTime> _end_snaps;
+	std::list<dcpomatic::DCPTime> _start_snaps;
+	std::list<dcpomatic::DCPTime> _end_snaps;
 	Tool _tool;
 	int _x_scroll_rate;
 	int _y_scroll_rate;
@@ -140,4 +143,5 @@ private:
 
 	boost::signals2::scoped_connection _film_changed_connection;
 	boost::signals2::scoped_connection _film_content_change_connection;
+	boost::signals2::scoped_connection _viewer_position_change_connection;
 };