merge hv v6, rework trace methods

[goodguy/history.git] / cinelerra-5.1 / cinelerra / trackcanvas.h

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.h b/cinelerra-5.1/cinelerra/trackcanvas.h
index cfa9a9539501d81be4160e0716e8c5b42ff55fa2..c7b7f8463decc834c96c02a0a43f7663691baf77 100644 (file)
--- a/cinelerra-5.1/cinelerra/trackcanvas.h
+++ b/cinelerra-5.1/cinelerra/trackcanvas.h
@@ -259,7 +259,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();
@@ -307,7 +307,6 @@ public:
        int do_tracks(int cursor_x,
                int cursor_y,
                int button_press);
-       int do_edit_popup();
        int test_resources(int cursor_x, int cursor_y);
        int do_plugins(int cursor_x,
                int cursor_y,
@@ -400,8 +399,7 @@ public:
        ArrayList<PluginOn*> plugin_on_toggles;
        ArrayList<PluginShow*> plugin_show_toggles;
 
-
-
+       static int auto_operations[];
 // event handlers
        void draw_paste_destination();