X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.h;h=a5d007e56bcefdeac63b8188881de2280281106d;hb=255afe5bf50d8e2d10075c0b8ab0f88efbe91570;hp=c7b7f8463decc834c96c02a0a43f7663691baf77;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/trackcanvas.h b/cinelerra-5.1/cinelerra/trackcanvas.h index c7b7f846..a5d007e5 100644 --- a/cinelerra-5.1/cinelerra/trackcanvas.h +++ b/cinelerra-5.1/cinelerra/trackcanvas.h @@ -84,7 +84,8 @@ public: 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, @@ -327,6 +329,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(); @@ -398,6 +401,7 @@ public: // Plugin toggle interfaces ArrayList plugin_on_toggles; ArrayList plugin_show_toggles; + ArrayList preset_edit_buttons; static int auto_operations[]; // event handlers @@ -413,7 +417,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