X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.h;h=b42660c57bb1a29c26bb0a586bfbd5376b3b3b2f;hp=9f86d81d3e1c83439c8b362bc0675f5aba84c7fe;hb=7eded24eb31529ad7652dea64e34b0a6210e5be1;hpb=2ba7e9962ea989863e152373e96a09b00a0b4eb8

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.h b/cinelerra-5.1/cinelerra/trackcanvas.h
index 9f86d81d..b42660c5 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.h
+++ b/cinelerra-5.1/cinelerra/trackcanvas.h
@@ -77,14 +77,15 @@ public:
 	void draw_playback_cursor();
 	void draw_highlighting();
 	void draw_keyframe_reticle();
-	int draw_hairline(Auto *auto_keyframe, int color);
+	int draw_hairline(Auto *auto_keyframe, int color, int show);
 
 // User can either call draw or draw_overlays to copy a fresh
 // canvas and just draw the overlays over it
 	void draw_overlays();
 	void update_handles();
 // Convert edit coords to transition coords
-	void get_transition_coords(int64_t &x, int64_t &y, int64_t &w, int64_t &h);
+	void get_transition_coords(Edit *edit,
+		int64_t &x, int64_t &y, int64_t &w, int64_t &h);
 	void get_handle_coords(Edit *edit,
 		int64_t &x,
 		int64_t &y,
@@ -103,20 +104,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,
@@ -256,10 +258,12 @@ public:
 		double zoom_units,
 		double yscale,
 		int autogrouptype);
-	void synchronize_autos(float change, Track *skip, FloatAuto *fauto, int fill_gangs);
 
+	void fill_ganged_autos(int all, float change, Track *skip, FloatAuto *fauto);
+	void update_ganged_autos(float change, Track *skip, FloatAuto *fauto);
+	void clear_ganged_autos();
 
-	void draw_brender_start();
+	void draw_brender_range();
 	void draw_loop_points();
 	void draw_transitions();
 	void draw_drag_handle();
@@ -327,6 +331,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();
@@ -349,6 +354,7 @@ public:
 	double time_visible();
 	void update_drag_handle();
 	int update_drag_edit();
+	int render_handle_frame(EDL *edl, int64_t pos, int mode);
 	int update_drag_floatauto(int cursor_x, int cursor_y);
 	int update_drag_toggleauto(int cursor_x, int cursor_y);
 	int update_drag_auto(int cursor_x, int cursor_y);
@@ -398,6 +404,7 @@ 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
@@ -413,7 +420,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