X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fgradient%2Fgradient.h;h=f49af423e0552d7b396714426f1c79369b336256;hp=f6d1d99450b1e8ebefe6cddc919caa851134102f;hb=9668279ccef86a9cc9138aaa1a659f158698f829;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/plugins/gradient/gradient.h b/cinelerra-5.1/plugins/gradient/gradient.h
index f6d1d994..f49af423 100644
--- a/cinelerra-5.1/plugins/gradient/gradient.h
+++ b/cinelerra-5.1/plugins/gradient/gradient.h
@@ -152,56 +152,46 @@ public:
 	GradientMain *plugin;
 };
 
-class GradientInColorButton : public BC_GenericButton
+class GradientInColorButton : public ColorBoxButton
 {
 public:
-	GradientInColorButton(GradientMain *plugin, GradientWindow *window, int x, int y);
-	int handle_event();
-	GradientMain *plugin;
-	GradientWindow *window;
-};
+	GradientInColorButton(GradientMain *plugin, GradientWindow *gui,
+		int x, int y, int color, int alpha);
+	~GradientInColorButton();
 
+	int handle_new_color(int color, int alpha);
+	void handle_done_event(int result);
 
-class GradientOutColorButton : public BC_GenericButton
-{
-public:
-	GradientOutColorButton(GradientMain *plugin, GradientWindow *window, int x, int y);
-	int handle_event();
 	GradientMain *plugin;
-	GradientWindow *window;
+	GradientWindow *gui;
+	VFrame *vframes[3];
 };
 
-class GradientReset : public BC_GenericButton
+class GradientOutColorButton : public ColorBoxButton
 {
 public:
-	GradientReset(GradientMain *plugin, GradientWindow *window, int x, int y);
-	int handle_event();
-	GradientMain *plugin;
-	GradientWindow *window;
-};
+	GradientOutColorButton(GradientMain *plugin, GradientWindow *gui,
+		int x, int y, int color, int alpha);
+	~GradientOutColorButton();
 
+	int handle_new_color(int color, int alpha);
+	void handle_done_event(int result);
 
-class GradientInColorThread : public ColorPicker
-{
-public:
-	GradientInColorThread(GradientMain *plugin, GradientWindow *window);
-	virtual int handle_new_color(int output, int alpha);
 	GradientMain *plugin;
-	GradientWindow *window;
+	GradientWindow *gui;
+	VFrame *vframes[3];
 };
 
-
-class GradientOutColorThread : public ColorPicker
+class GradientReset : public BC_GenericButton
 {
 public:
-	GradientOutColorThread(GradientMain *plugin, GradientWindow *window);
-	virtual int handle_new_color(int output, int alpha);
+	GradientReset(GradientMain *plugin, GradientWindow *window, int x, int y);
+	int handle_event();
 	GradientMain *plugin;
 	GradientWindow *window;
 };
 
 
-
 class GradientWindow : public PluginClientWindow
 {
 public:
@@ -209,8 +199,6 @@ public:
 	~GradientWindow();
 
 	void create_objects();
-	void update_in_color();
-	void update_out_color();
 	void update_gui();
 	void update_shape();
 	void done_event(int result);
@@ -223,8 +211,6 @@ public:
 	GradientInColorButton *in_color;
 	GradientOutColorButton *out_color;
 	GradientReset *reset;
-	GradientInColorThread *in_color_thread;
-	GradientOutColorThread *out_color_thread;
 	GradientShape *shape;
 	BC_Title *shape_title;
 	GradientCenterX *center_x;
@@ -232,17 +218,10 @@ public:
 	BC_Title *center_y_title;
 	GradientCenterY *center_y;
 	GradientRate *rate;
-	int in_color_x, in_color_y;
-	int out_color_x, out_color_y;
 	int shape_x, shape_y;
 };
 
 
-
-
-
-
-
 class GradientMain : public PluginVClient
 {
 public:
@@ -267,6 +246,9 @@ public:
 	VFrame *gradient;
 	VFrame *input, *output;
 	GradientServer *engine;
+	float gradient_size;
+	uint8_t *table;
+	int table_size;
 };
 
 class GradientPackage : public LoadPackage