X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.h;h=006b7805eb3201bcbb5455742d43da8081513d99;hb=9a75aafbc51be29b49351a51e9084bb34d255c0d;hp=d6787999d0f0ac1d8fb38cff9b0bfe006776ec3b;hpb=3fc547b01e919d3044bacf2a78baddeaed04e3a0;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.h b/cinelerra-5.1/cinelerra/trackcanvas.h
index d6787999..006b7805 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.h
+++ b/cinelerra-5.1/cinelerra/trackcanvas.h
@@ -99,41 +99,18 @@ public:
 	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,
-		int zoom_track,
-		int color);
-	int test_auto(Auto *current,
-		int x,
-		int y,
-		int center_pixel,
-		int zoom_track,
-		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 zoom_track,
-		int cursor_x,
-		int cursor_y,
-		int buttonpress,
+	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);
+	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 autogrouptype);
 	void draw_floatline(int center_pixel,
 		FloatAuto *previous,
@@ -260,6 +237,7 @@ public:
 	void draw_loop_points();
 	void draw_transitions();
 	void draw_drag_handle();
+	void draw_selected_edits(EDL *edl, int dx, int dy, int color0, int color1);
 	void draw_plugins();
 	void refresh_plugintoggles();
 	void update_edit_handles(Edit *edit, int64_t edit_x, int64_t edit_y, int64_t edit_w, int64_t edit_h);
@@ -276,6 +254,10 @@ public:
 	void get_pixmap_size(Edit *edit, int64_t edit_x, int64_t edit_w, int64_t &pixmap_x, int64_t &pixmap_w, int64_t &pixmap_h);
 	ResourcePixmap* create_pixmap(Edit *edit, int64_t edit_x, int64_t pixmap_x, int64_t pixmap_w, int64_t pixmap_h);
 	void update_cursor(int flush);
+	void draw_selected(int x, int y, int w, int h);
+	int arrow_mode();
+	int ibeam_mode();
+
 // Get edit and handle the cursor is over
 	int do_edit_handles(int cursor_x,
 		int cursor_y,
@@ -304,6 +286,8 @@ public:
 	int do_tracks(int cursor_x,
 		int cursor_y,
 		int button_press);
+	int test_track_group(EDL *group, Track *first_track, double &pos);
+	int edit_intersects(Track *track, Edit *src_edit, double &pos);
 	int test_resources(int cursor_x, int cursor_y);
 	int do_plugins(int cursor_x,
 		int cursor_y,
@@ -334,10 +318,11 @@ public:
 	int start_selection(double position);
 	int drag_motion_event();
 	int drag_stop_event();
-	int drag_motion(Track **over_track,
-		Edit **over_edit,
-		PluginSet **over_pluginset,
-		Plugin **over_plugin);
+	int drag_motion(Track **over_track, Edit **over_edit,
+		PluginSet **over_pluginset, Plugin **over_plugin);
+	int drag_cursor_motion(int cursor_x, int cursor_y,
+		Track **over_track, Edit **over_edit,
+		PluginSet **over_pluginset, Plugin **over_plugin);
 	int drag_stop(int *redraw);
 	int64_t drop_edit_position (int *is_insertion, Edit *moved_edit, int64_t moved_edit_length);
 	int64_t drop_plugin_position(PluginSet *plugin_set, Plugin *moved_plugin);
@@ -352,13 +337,12 @@ public:
 	int update_drag_toggleauto(int cursor_x, int cursor_y);
 	int update_drag_auto(int cursor_x, int cursor_y);
 	int update_drag_pluginauto(int cursor_x, int cursor_y);
-	void show_message(Auto *current, int show_curve_type, const char *fmt, ...);
+	void show_message(Auto *current, int box_color, const char *fmt, ...);
 
 // Update status bar to reflect drag operation
 	void update_drag_caption();
 
 	int get_title_h();
-	int resource_h();
 
 // Display hourglass if timer expired
 	void test_timer();