X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.h;h=ccdb3c26e04c4b23751c41373519e2b5650924a0;hp=4691fc0781b41a75fac87e57468bfb6194269fdc;hb=7ead9f7382846e81c2f8efb25780014e5f8834c3;hpb=2f5f5847bfeea491f69f5314dcbccaf6de4b22e4;ds=sidebyside

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h
index 4691fc07..ccdb3c26 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.h
+++ b/cinelerra-5.1/cinelerra/cwindowtool.h
@@ -145,6 +145,26 @@ public:
 	void update_items(MaskAuto *keyframe);
 };
 
+class CWindowMaskDelMask : public BC_GenericButton
+{
+public:
+	CWindowMaskDelMask(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	int handle_event();
+	MWindow *mwindow;
+	CWindowToolGUI *gui;
+};
+
+class CWindowMaskClrMask : public BC_Button
+{
+public:
+	CWindowMaskClrMask(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y);
+	~CWindowMaskClrMask();
+	static int calculate_w(MWindow *mwindow);
+	int handle_event();
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+};
+
 class CWindowMaskFade : public BC_TumbleTextBox
 {
 public:
@@ -169,43 +189,55 @@ public:
 	MWindow *mwindow;
 	CWindowToolGUI *gui;
 	int stick;
+	float last_v;
 	Timer *timer;
 };
 
-class CWindowMaskMode : public BC_Toggle
+class CWindowMaskGangFader : public BC_Toggle
 {
 public:
-	CWindowMaskMode(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
-	~CWindowMaskMode();
+	CWindowMaskGangFader(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	~CWindowMaskGangFader();
 	int handle_event();
 	MWindow *mwindow;
 	CWindowToolGUI *gui;
 };
 
-class CWindowMaskDelMask : public BC_GenericButton
+class CWindowMaskAffectedPoint : public BC_TumbleTextBox
 {
 public:
-	CWindowMaskDelMask(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	CWindowMaskAffectedPoint(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	~CWindowMaskAffectedPoint();
 	int handle_event();
 	MWindow *mwindow;
 	CWindowToolGUI *gui;
 };
 
-class CWindowMaskAffectedPoint : public BC_TumbleTextBox
+class CWindowMaskFocus : public BC_CheckBox
 {
 public:
-	CWindowMaskAffectedPoint(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
-	~CWindowMaskAffectedPoint();
+	CWindowMaskFocus(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	~CWindowMaskFocus();
 	int handle_event();
 	MWindow *mwindow;
 	CWindowToolGUI *gui;
 };
 
-class CWindowMaskFocus : public BC_CheckBox
+class CWindowMaskDrawMarkers : public BC_CheckBox
 {
 public:
-	CWindowMaskFocus(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
-	~CWindowMaskFocus();
+	CWindowMaskDrawMarkers(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	~CWindowMaskDrawMarkers();
+	int handle_event();
+	MWindow *mwindow;
+	CWindowToolGUI *gui;
+};
+
+class CWindowMaskDrawBoundary : public BC_CheckBox
+{
+public:
+	CWindowMaskDrawBoundary(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	~CWindowMaskDrawBoundary();
 	int handle_event();
 	MWindow *mwindow;
 	CWindowToolGUI *gui;
@@ -244,27 +276,19 @@ public:
 	char *get_caption() { return 0; }
 	MWindow *mwindow;
 	CWindowToolGUI *gui;
+	int stick;
+	float last_v;
+	Timer *timer;
 };
 
-class CWindowMaskClrMask : public BC_Button
-{
-public:
-	CWindowMaskClrMask(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y);
-	~CWindowMaskClrMask();
-	static int calculate_w(MWindow *mwindow);
-	int handle_event();
-	MWindow *mwindow;
-	CWindowMaskGUI *gui;
-};
-
-class CWindowMaskClrFeather : public BC_Button
+class CWindowMaskGangFeather : public BC_Toggle
 {
 public:
-	CWindowMaskClrFeather(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y);
-	~CWindowMaskClrFeather();
+	CWindowMaskGangFeather(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	~CWindowMaskGangFeather();
 	int handle_event();
 	MWindow *mwindow;
-	CWindowMaskGUI *gui;
+	CWindowToolGUI *gui;
 };
 
 class CWindowMaskBeforePlugins : public BC_CheckBox
@@ -297,19 +321,24 @@ public:
 	void update_preview();
 
 	CWindowMaskName *name;
-	CWindowMaskClrMask *clr_mask;
 	CWindowMaskDelMask *del_mask;
+	CWindowMaskClrMask *clr_mask;
 	CWindowMaskFade *fade;
 	CWindowMaskFadeSlider *fade_slider;
-	CWindowMaskMode *mode;
+	CWindowMaskGangFader *gang_fader;
 	CWindowMaskAffectedPoint *active_point;
 	CWindowMaskDelPoint *del_point;
 	CWindowCoord *x, *y;
 	CWindowMaskFocus *focus;
 	int focused;
+	CWindowMaskDrawMarkers *draw_markers;
+	int markers;
+	CWindowMaskDrawBoundary *draw_boundary;
+	int boundary;
 	CWindowCoord *focus_x, *focus_y;
 	CWindowMaskFeather *feather;
 	CWindowMaskFeatherSlider *feather_slider;
+	CWindowMaskGangFeather *gang_feather;
 	CWindowMaskBeforePlugins *apply_before_plugins;
 	CWindowDisableOpenGLMasking *disable_opengl_masking;
 };