X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.h;h=4ba1cc425f022b6fe11d634052f7915a5c012ee8;hb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;hp=348286db8588c97397b16db8a8f92bddacaf361b;hpb=6166c045a8de42edd09924fdd995a77a3b753e54;p=dcpomatic.git

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 348286db8..4ba1cc425 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -21,12 +21,15 @@
 #include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <wx/wx.h>
-#include "util.h"
+#include "lib/util.h"
+#include "lib/rect.h"
+#include "content_menu.h"
 
 class Film;
 class View;
 class ContentView;
 class FilmEditor;
+class TimeAxisView;
 
 class Timeline : public wxPanel
 {
@@ -35,7 +38,7 @@ public:
 
 	boost::shared_ptr<const Film> film () const;
 
-	void force_redraw (Rect const &);
+	void force_redraw (dcpomatic::Rect<int> const &);
 
 	int x_offset () const {
 		return 8;
@@ -46,39 +49,61 @@ public:
 	}
 
 	int track_height () const {
-		return 64;
+		return 48;
 	}
 
-	double pixels_per_time_unit () const {
-		return _pixels_per_time_unit;
+	boost::optional<double> pixels_per_second () const {
+		return _pixels_per_second;
 	}
 
-	Position tracks_position () const {
-		return Position (8, 8);
+	Position<int> tracks_position () const {
+		return Position<int> (8, 8);
 	}
 
 	int tracks () const;
 
+	void setup_pixels_per_second ();
+
+	void set_snap (bool s) {
+		_snap = s;
+	}
+
+	bool snap () const {
+		return _snap;
+	}
+
 private:
-	void paint (wxPaintEvent &);
+	void paint ();
 	void left_down (wxMouseEvent &);
-	void mouse_moved (wxMouseEvent &);
 	void left_up (wxMouseEvent &);
+	void right_down (wxMouseEvent &);
+	void mouse_moved (wxMouseEvent &);
 	void playlist_changed ();
-	void setup_pixels_per_time_unit ();
-	void resized (wxSizeEvent &);
+	void resized ();
 	void assign_tracks ();
+	void set_position_from_event (wxMouseEvent &);
+	void clear_selection ();
+
+	typedef std::vector<boost::shared_ptr<View> > ViewList;
+	typedef std::vector<boost::shared_ptr<ContentView> > ContentViewList;
+
+	boost::shared_ptr<View> event_to_view (wxMouseEvent &);
+	ContentViewList selected_views () const;
+	ContentList selected_content () const;
 
 	FilmEditor* _film_editor;
 	boost::weak_ptr<Film> _film;
-	std::list<boost::shared_ptr<View> > _views;
+	ViewList _views;
+	boost::shared_ptr<TimeAxisView> _time_axis_view;
 	int _tracks;
-	double _pixels_per_time_unit;
+	boost::optional<double> _pixels_per_second;
 	bool _left_down;
 	wxPoint _down_point;
 	boost::shared_ptr<ContentView> _down_view;
-	Time _down_view_start;
+	DCPTime _down_view_position;
 	bool _first_move;
+	ContentMenu _menu;
+	bool _snap;
 
 	boost::signals2::scoped_connection _playlist_connection;
 };