X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.h;h=c8918071a1fda2223b4dd7c178a97822f5c749f3;hb=44967d5fd341812fb6395e906bae34e743011ebc;hp=4c7557295330d35a8f1cbdd08d4eaae5b7698680;hpb=8e69e9e7ab87fd5c273ce30a05c9973e786467d9;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h
index 4c755729..c8918071 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.h
+++ b/cinelerra-5.1/cinelerra/cwindowtool.h
@@ -37,6 +37,11 @@ enum {
 	MASK_SHAPE_TRIANGLE,
 	MASK_SHAPE_OVAL,
 };
+enum {
+	MASK_SCALE_X,
+	MASK_SCALE_Y,
+	MASK_SCALE_XY,
+};
 
 // This common thread supports all the tool GUI's.
 class CWindowTool : public Thread
@@ -329,6 +334,17 @@ public:
 	CWindowMaskGUI *gui;
 };
 
+class CWindowMaskGangPoint : public BC_Toggle
+{
+public:
+	CWindowMaskGangPoint(MWindow *mwindow, CWindowMaskGUI *gui,
+			int x, int y);
+	~CWindowMaskGangPoint();
+	int handle_event();
+	MWindow *mwindow;
+	CWindowMaskGUI *gui;
+};
+
 class CWindowMaskSmoothButton : public BC_Button
 {
 public:
@@ -415,7 +431,6 @@ public:
 	CWindowMaskDelPoint(MWindow *mwindow, CWindowMaskGUI *gui,
 			int x, int y);
 	int handle_event();
-	int keypress_event();
 	MWindow *mwindow;
 	CWindowMaskGUI *gui;
 };
@@ -441,11 +456,13 @@ public:
 	~CWindowMaskFeatherSlider();
 	int handle_event();
 	int update(float v);
+	int update(int r, float v, float mn, float mx);
 	char *get_caption() { return 0; }
 	MWindow *mwindow;
 	CWindowMaskGUI *gui;
 	int stick;
 	float last_v;
+	float max;
 	Timer *timer;
 };
 
@@ -652,6 +669,7 @@ public:
 	CWindowMaskGangFader *gang_fader;
 	CWindowMaskAffectedPoint *active_point;
 	CWindowMaskDelPoint *del_point;
+	CWindowMaskGangPoint *gang_point;
 	CWindowMaskSmoothButton *mask_pnt_linear, *mask_pnt_smooth;
 	CWindowMaskSmoothButton *mask_crv_linear, *mask_crv_smooth;
 	CWindowMaskSmoothButton *mask_all_linear, *mask_all_smooth;