merge hv v6, rework trace methods

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

diff --git a/cinelerra-5.1/cinelerra/mainmenu.h b/cinelerra-5.1/cinelerra/mainmenu.h
index b88768ebab26d464871cfca9c2c2c39df564fc11..ebbd208bf2af4240c044900d8ea7e391fcd7f5ad 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainmenu.h
+++ b/cinelerra-5.1/cinelerra/mainmenu.h
@@ -284,18 +284,18 @@ public:
 class KeyframeCurveType : public BC_MenuItem
 {
 public:
-       KeyframeCurveType(MWindow *mwindow, int curve_type);
+       KeyframeCurveType(MWindow *mwindow);
        ~KeyframeCurveType();
 
        void create_objects();
+       void update(int curve_type);
        int handle_event();
 
        MWindow *mwindow;
        KeyframeCurveTypeMenu *curve_menu;
-       int curve_type;
 };
 
-class KeyframeCurveTypeMenu : public BC_PopupMenu
+class KeyframeCurveTypeMenu : public BC_SubMenu
 {
 public:
        KeyframeCurveTypeMenu(KeyframeCurveType *menu_item);
@@ -307,11 +307,13 @@ public:
 class KeyframeCurveTypeItem : public BC_MenuItem
 {
 public:
-       KeyframeCurveTypeItem(int type);
+       KeyframeCurveTypeItem(int type, KeyframeCurveType *main_item);
        ~KeyframeCurveTypeItem();
 
-       int handle_event();
+       KeyframeCurveType *main_item;
        int type;
+
+       int handle_event();
 };
 
 class CutDefaultKeyframe : public BC_MenuItem
@@ -552,10 +554,10 @@ public:
        MWindow *mwindow;
 };
 
-class SetBRenderStart : public BC_MenuItem
+class SetBRenderRange : public BC_MenuItem
 {
 public:
-       SetBRenderStart(MWindow *mwindow);
+       SetBRenderRange(MWindow *mwindow);
        int handle_event();
        MWindow *mwindow;
 };