X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.h;h=2bda2ea97aad50e154796144750399e0aa5b7fad;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hp=396a7ff352047a220234faffc02dcf12a0770ed7;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/trackcanvas.h b/cinelerra-5.1/cinelerra/trackcanvas.h index 396a7ff3..2bda2ea9 100644 --- a/cinelerra-5.1/cinelerra/trackcanvas.h +++ b/cinelerra-5.1/cinelerra/trackcanvas.h @@ -76,6 +76,9 @@ public: void draw_highlight_insertion(int x, int y, int w, int h); void draw_playback_cursor(); void draw_highlighting(); + void draw_keyframe_reticle(); + int draw_hairline(Auto *auto_keyframe, int color); + // User can either call draw or draw_overlays to copy a fresh // canvas and just draw the overlays over it void draw_overlays(); @@ -100,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, @@ -256,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(); @@ -324,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(); @@ -395,9 +400,9 @@ public: // Plugin toggle interfaces ArrayList plugin_on_toggles; ArrayList plugin_show_toggles; + ArrayList preset_edit_buttons; - - + static int auto_operations[]; // event handlers void draw_paste_destination(); @@ -411,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