X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainmenu.h;h=2796e15571c84bd0f60de3985fd32f9ed9fafb41;hb=efb3600851fd27b13d3053ffbdb6434535580bfd;hp=b88768ebab26d464871cfca9c2c2c39df564fc11;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mainmenu.h b/cinelerra-5.1/cinelerra/mainmenu.h
index b88768eb..2796e155 100644
--- a/cinelerra-5.1/cinelerra/mainmenu.h
+++ b/cinelerra-5.1/cinelerra/mainmenu.h
@@ -28,6 +28,7 @@ class PluginsFollowEdits;
 class KeyframesFollowEdits;
 class CursorOnFrames;
 class TypelessKeyframes;
+class SetBRenderActive;
 class LoopPlayback;
 
 class Redo;
@@ -42,6 +43,7 @@ class KeyframeCurveTypeMenu;
 class KeyframeCurveTypeItem;
 class SplitX;
 class SplitY;
+class MixerViewer;
 
 
 #include "arraylist.h"
@@ -104,7 +106,7 @@ public:
 
 	RecordMenuItem *record_menu_item;
 	RenderItem *render;
-	New *new_project;
+	NewProject *new_project;
 	MenuAEffectItem *aeffect[TOTAL_EFFECTS];
 	MenuVEffectItem *veffect[TOTAL_EFFECTS];
 	Quit *quit_program;              // affected by save
@@ -120,6 +122,7 @@ public:
 	KeyframesFollowEdits *keyframes_follow_edits;
 	CursorOnFrames *cursor_on_frames;
 	TypelessKeyframes *typeless_keyframes;
+	SetBRenderActive *brender_active;
 	LoopPlayback *loop_playback;
 	ShowAssets *show_assets;
 	ShowTitles *show_titles;
@@ -144,6 +147,7 @@ public:
 	ShowLWindow *show_lwindow;
 	SplitX *split_x;
 	SplitY *split_y;
+	MixerViewer *mixer_viewer;
 };
 
 // ========================================= edit
@@ -284,18 +288,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 +311,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
@@ -402,6 +408,14 @@ public:
 	MWindow *mwindow;
 };
 
+class TileMixers : public BC_MenuItem
+{
+public:
+	TileMixers(MWindow *mwindow);
+	int handle_event();
+	MWindow *mwindow;
+};
+
 // ======================================== audio
 
 class AddAudioTrack : public BC_MenuItem
@@ -552,10 +566,10 @@ public:
 	MWindow *mwindow;
 };
 
-class SetBRenderStart : public BC_MenuItem
+class SetBRenderActive : public BC_MenuItem
 {
 public:
-	SetBRenderStart(MWindow *mwindow);
+	SetBRenderActive(MWindow *mwindow);
 	int handle_event();
 	MWindow *mwindow;
 };
@@ -683,4 +697,12 @@ public:
 	MWindow *mwindow;
 };
 
+class MixerViewer : public BC_MenuItem
+{
+public:
+	MixerViewer(MWindow *mwindow);
+	int handle_event();
+	MWindow *mwindow;
+};
+
 #endif