X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.h;h=d08b420a0163f0859b5403a52a6dc20cbff591cb;hb=22c6251d37911a11e322bf7518e6a992ea0bb6c7;hp=006b7805eb3201bcbb5455742d43da8081513d99;hpb=fbdd13b462256ed4f3b35dc114385fe0b0de0dcd;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.h b/cinelerra-5.1/cinelerra/trackcanvas.h
index 006b7805..d08b420a 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.h
+++ b/cinelerra-5.1/cinelerra/trackcanvas.h
@@ -71,6 +71,8 @@ public:
 	void draw_highlighting();
 	void draw_keyframe_reticle();
 	int draw_hairline(Auto *auto_keyframe, int color, int show);
+	void draw_speed_highlight();
+	void draw_speed_track(Track *track);
 
 // User can either call draw or draw_overlays to copy a fresh
 // canvas and just draw the overlays over it
@@ -101,16 +103,16 @@ public:
 	void draw_inout_points();
 	void draw_auto(Auto *current, int x, int y,
 		int center_pixel, int data_h);
-	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 data_h, int color);
+	void draw_floatauto(FloatAuto *current,
+		int x_offset, int center_pixel, int data_h, int color,
+		double unit_start, double zoom_units, double yscale,
+		int autogrouptype);
 	int test_auto(Auto *current, int x, int y,
 		int center_pixel, int data_h,
 		int cursor_x, int cursor_y, int buttonpress);
-	int test_floatauto(FloatAuto *current, int x, int y,
-		int in_x, int in_y, int out_x, int out_y,
-		int center_pixel, int data_h,
-		int cursor_x, int cursor_y, int buttonpress,
+	int test_floatauto(FloatAuto *current, int buttonpress,
+		int center_pixel, int data_h, int cursor_x, int cursor_y,
+		double unit_start, double zoom_units, double yscale,
 		int autogrouptype);
 	void draw_floatline(int center_pixel,
 		FloatAuto *previous,
@@ -212,24 +214,13 @@ public:
 // if reference is nonzero and a FloatAuto,
 //     the result is made relative to the value in reference.
 	float percentage_to_value(float percentage,
-		int is_toggle,
-		Auto *reference,
-		int autogrouptype);
-
+		int is_toggle, Auto *reference, int autogrouptype);
 // Get x and y of a FloatAuto relative to center_pixel
-	void calculate_auto_position(double *x,
-		double *y,
-		double *in_x,
-		double *in_y,
-		double *out_x,
-		double *out_y,
-		Auto *current,
-		double unit_start,
-		double zoom_units,
-		double yscale,
-		int autogrouptype);
-
-	void fill_ganged_autos(int all, float change, Track *skip, FloatAuto *fauto);
+	void calculate_auto_position(int edge, double *x, double *y,
+		double *in_x, double *in_y, double *out_x, double *out_y,
+		Auto *current, double unit_start, double zoom_units,
+		double yscale, int autogrouptype);
+	void fill_ganged_autos(int gang, float change, Track *skip, FloatAuto *fauto);
 	void update_ganged_autos(float change, Track *skip, FloatAuto *fauto);
 	void clear_ganged_autos();