X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.h;h=2bda2ea97aad50e154796144750399e0aa5b7fad;hp=cfa9a9539501d81be4160e0716e8c5b42ff55fa2;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hpb=c9de74551f43dad1b898603c0827985773c0cf9d

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.h b/cinelerra-5.1/cinelerra/trackcanvas.h
index cfa9a953..2bda2ea9 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.h
+++ b/cinelerra-5.1/cinelerra/trackcanvas.h
@@ -103,20 +103,21 @@ public:
 		int64_t edit_w,
 		int64_t edit_h);
 	void draw_automation();
+	void draw_hard_edges();
 	void draw_inout_points();
 	void draw_auto(Auto *current,
 		int x,
 		int y,
 		int center_pixel,
 		int zoom_track);
-	void draw_floatauto(FloatAuto *current, 
-		int x, 
-		int y, 
-		int in_x, 
-		int in_y, 
-		int out_x, 
-		int out_y, 
-		int center_pixel, 
+	void draw_floatauto(FloatAuto *current,
+		int x,
+		int y,
+		int in_x,
+		int in_y,
+		int out_x,
+		int out_y,
+		int center_pixel,
 		int zoom_track,
 		int color);
 	int test_auto(Auto *current,
@@ -259,7 +260,7 @@ public:
 	void synchronize_autos(float change, Track *skip, FloatAuto *fauto, int fill_gangs);
 
 
-	void draw_brender_start();
+	void draw_brender_range();
 	void draw_loop_points();
 	void draw_transitions();
 	void draw_drag_handle();
@@ -307,7 +308,6 @@ public:
 	int do_tracks(int cursor_x,
 		int cursor_y,
 		int button_press);
-	int do_edit_popup();
 	int test_resources(int cursor_x, int cursor_y);
 	int do_plugins(int cursor_x,
 		int cursor_y,
@@ -328,6 +328,7 @@ public:
 		int max_y);
 	int button_press_event();
 	int button_release_event();
+	int cursor_update(int in_motion);
 	int cursor_motion_event();
 	int activate();
 	int deactivate();
@@ -399,9 +400,9 @@ public:
 // Plugin toggle interfaces
 	ArrayList<PluginOn*> plugin_on_toggles;
 	ArrayList<PluginShow*> plugin_show_toggles;
+	ArrayList<PluginPresetEdit*> preset_edit_buttons;
 
-
-
+	static int auto_operations[];
 // event handlers
 	void draw_paste_destination();
 
@@ -415,7 +416,8 @@ public:
 // ====================================== cursor selection type
 
 	double selection_midpoint;        // division between current ends
-
+	int snapped;			// drag handle snapping
+	EDL *speed_edl;			// drag speed handle start edl
 };
 
 #endif