X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainmenu.h;h=3498c2adcdcab785f9537e07c2d440e38d31725a;hp=f0c493b22a735af15ea23dc1f8fcef70c14ae636;hb=HEAD;hpb=c9c0e07706fad701a70ee0d1ffb0fcb6304f138c

diff --git a/cinelerra-5.1/cinelerra/mainmenu.h b/cinelerra-5.1/cinelerra/mainmenu.h
index f0c493b2..0da2c60e 100644
--- a/cinelerra-5.1/cinelerra/mainmenu.h
+++ b/cinelerra-5.1/cinelerra/mainmenu.h
@@ -35,6 +35,7 @@
 #include "module.inc"
 #include "new.inc"
 #include "plugindialog.inc"
+#include "proxy.inc"
 #include "quit.inc"
 #include "record.inc"
 #include "render.inc"
@@ -141,6 +142,8 @@ public:
 	int total_aeffects, total_veffects;
 
 	KeyframeCurveType *keyframe_curve_type;
+	KeyframeCreate *keyframe_create;
+	SetAutomationCurveMode *set_auto_curves;
 	LabelsFollowEdits *labels_follow_edits;
 	PluginsFollowEdits *plugins_follow_edits;
 	KeyframesFollowEdits *keyframes_follow_edits;
@@ -172,9 +175,9 @@ public:
 	SplitX *split_x;
 	SplitY *split_y;
 	MixerItems *mixer_items;
-	AlignTimecodes *align_timecodes;
 	LoadLayout *load_layout;
 	LoadLayout *save_layout;
+	ProxyMenuItem *proxy;
 };
 
 // ========================================= edit
@@ -342,22 +345,34 @@ public:
 	MWindow *mwindow;
 };
 
-class StraightenKeyframes : public BC_MenuItem
+
+class SetAutomationCurveItem : public BC_MenuItem
 {
 public:
-	StraightenKeyframes(MWindow *mwindow);
+	SetAutomationCurveItem(SetAutomationCurveMode *set_curve_mode, int id);
 	int handle_event();
-	MWindow *mwindow;
+	SetAutomationCurveMode *set_curve_mode;
+	int id;
 };
 
-class BendKeyframes : public BC_MenuItem
+class SetAutoCurveModeMenu : public BC_SubMenu
 {
 public:
-	BendKeyframes(MWindow *mwindow);
-	int handle_event();
+	SetAutoCurveModeMenu(SetAutomationCurveMode *curve_mode);
+	SetAutomationCurveMode *curve_mode;
+};
+
+class SetAutomationCurveMode : public BC_MenuItem
+{
+public:
+	SetAutomationCurveMode(MWindow *mwindow);
+	void create_objects();
+
 	MWindow *mwindow;
+	SetAutoCurveModeMenu *curve_mode_menu;
 };
 
+
 class KeyframeCurveType : public BC_MenuItem
 {
 public:
@@ -393,6 +408,34 @@ public:
 	int handle_event();
 };
 
+class KeyframeCreateItem : public BC_MenuItem
+{
+public:
+	KeyframeCreateItem(KeyframeCreate *keyframe_create, const char *text, int mask);
+	int handle_event();
+
+	KeyframeCreate *keyframe_create;
+	int mask;
+};
+
+class KeyframeCreateMenu : public BC_SubMenu
+{
+public:
+	KeyframeCreateMenu(KeyframeCreate *keyframe_create);
+	KeyframeCreate *keyframe_create;
+};
+
+class KeyframeCreate : public BC_MenuItem
+{
+public:
+	KeyframeCreate(MWindow *mwindow);
+	void create_objects();
+
+	MWindow *mwindow;
+	KeyframeCreateMenu *keyframe_create_menu;
+};
+
+
 class CutDefaultKeyframe : public BC_MenuItem
 {
 public:
@@ -525,11 +568,23 @@ public:
 	int handle_event();
 };
 
-class TileMixers : public MixerItem
+class DragTileMixers : public MixerItem
 {
 public:
-	TileMixers(MixerItems *mixer_items);
+	DragTileMixers(MixerItems *mixer_items);
+	~DragTileMixers();
 	int handle_event();
+	TileMixersDragBox *drag_box;
+};
+
+class TileMixersDragBox : public BC_DragBox
+{
+public:
+	TileMixersDragBox(MWindowGUI *gui);
+	void start(DragTileMixers *tile_mixers);
+	int handle_done_event(int x0, int y0, int x1, int y1);
+
+	DragTileMixers *tile_mixers;
 };
 
 class AlignMixers : public MixerItem
@@ -539,6 +594,13 @@ public:
 	int handle_event();
 };
 
+class MixMasters : public MixerItem
+{
+public:
+	MixMasters(MixerItems *mixer_items);
+	int handle_event();
+};
+
 class AlignTimecodes : public BC_MenuItem
 {
 public:
@@ -648,34 +710,34 @@ public:
 // ========================================== settings
 
 
-class MoveTracksUp : public BC_MenuItem
+class RollTracksUp : public BC_MenuItem
 {
 public:
-	MoveTracksUp(MWindow *mwindow);
+	RollTracksUp(MWindow *mwindow);
 	int handle_event();
 	MWindow *mwindow;
 };
 
-class MoveTracksDown : public BC_MenuItem
+class RollTracksDown : public BC_MenuItem
 {
 public:
-	MoveTracksDown(MWindow *mwindow);
+	RollTracksDown(MWindow *mwindow);
 	int handle_event();
 	MWindow *mwindow;
 };
 
-class SwapTracksUp : public BC_MenuItem
+class MoveTracksUp : public BC_MenuItem
 {
 public:
-	SwapTracksUp(MWindow *mwindow);
+	MoveTracksUp(MWindow *mwindow);
 	int handle_event();
 	MWindow *mwindow;
 };
 
-class SwapTracksDown : public BC_MenuItem
+class MoveTracksDown : public BC_MenuItem
 {
 public:
-	SwapTracksDown(MWindow *mwindow);
+	MoveTracksDown(MWindow *mwindow);
 	int handle_event();
 	MWindow *mwindow;
 };