X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.h;h=cab0ea0e08525bc36221cbf401c360ee9b750757;hb=21fb4ee6deb1321b37ad360cabdc8963774a4897;hp=0470ed7b99c2e64300d981452694f8105d14b556;hpb=d5085584d82c021e924cec6ce00e682a8e63d800;p=dcpomatic.git

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 0470ed7b9..cab0ea0e0 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,19 +21,20 @@
 #include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <wx/wx.h>
-#include "util.h"
-#include "rect.h"
+#include "lib/util.h"
+#include "lib/rect.h"
+#include "content_menu.h"
+#include "timeline_content_view.h"
 
 class Film;
-class View;
-class ContentView;
-class FilmEditor;
-class TimeAxisView;
+class ContentPanel;
+class TimelineView;
+class TimelineTimeAxisView;
 
 class Timeline : public wxPanel
 {
 public:
-	Timeline (wxWindow *, FilmEditor *, boost::shared_ptr<Film>);
+	Timeline (wxWindow *, ContentPanel *, boost::shared_ptr<Film>);
 
 	boost::shared_ptr<const Film> film () const;
 
@@ -51,8 +52,8 @@ public:
 		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<int> tracks_position () const {
@@ -61,28 +62,49 @@ public:
 
 	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 playlist_content_changed (int);
+	void resized ();
 	void assign_tracks ();
-	void set_start_from_event (wxMouseEvent &);
+	void set_position_from_event (wxMouseEvent &);
+	void clear_selection ();
+	void recreate_views ();
+
+	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;
 
-	FilmEditor* _film_editor;
+	ContentPanel* _content_panel;
 	boost::weak_ptr<Film> _film;
-	std::list<boost::shared_ptr<View> > _views;
-	boost::shared_ptr<TimeAxisView> _time_axis_view;
+	TimelineViewList _views;
+	boost::shared_ptr<TimelineTimeAxisView> _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;
+	boost::shared_ptr<TimelineContentView> _down_view;
+	DCPTime _down_view_position;
 	bool _first_move;
+	ContentMenu _menu;
+	bool _snap;
 
-	boost::signals2::scoped_connection _playlist_connection;
+	boost::signals2::scoped_connection _playlist_changed_connection;
+	boost::signals2::scoped_connection _playlist_content_changed_connection;
 };