X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fgradient%2Fgradient.h;h=f6d1d99450b1e8ebefe6cddc919caa851134102f;hb=8d1277ccc789cf008150742da9fe66b21183541c;hp=715b5b5255983f5c73f51b38ebfd8ef5e13fcd3e;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/gradient/gradient.h b/cinelerra-5.1/plugins/gradient/gradient.h
index 715b5b52..f6d1d994 100644
--- a/cinelerra-5.1/plugins/gradient/gradient.h
+++ b/cinelerra-5.1/plugins/gradient/gradient.h
@@ -37,7 +37,7 @@ class GradientServer;
 #include "guicast.h"
 #include "loadbalance.h"
 #include "overlayframe.inc"
-#include "cicolors.h"
+#include "bccolors.h"
 #include "pluginvclient.h"
 #include "thread.h"
 #include "vframe.inc"
@@ -48,6 +48,7 @@ public:
 	GradientConfig();
 
 	int equivalent(GradientConfig &that);
+	void reset();
 	void copy_from(GradientConfig &that);
 	void interpolate(GradientConfig &prev,
 		GradientConfig &next,
@@ -170,8 +171,17 @@ public:
 	GradientWindow *window;
 };
 
+class GradientReset : public BC_GenericButton
+{
+public:
+	GradientReset(GradientMain *plugin, GradientWindow *window, int x, int y);
+	int handle_event();
+	GradientMain *plugin;
+	GradientWindow *window;
+};
 
-class GradientInColorThread : public ColorThread
+
+class GradientInColorThread : public ColorPicker
 {
 public:
 	GradientInColorThread(GradientMain *plugin, GradientWindow *window);
@@ -181,7 +191,7 @@ public:
 };
 
 
-class GradientOutColorThread : public ColorThread
+class GradientOutColorThread : public ColorPicker
 {
 public:
 	GradientOutColorThread(GradientMain *plugin, GradientWindow *window);
@@ -201,7 +211,9 @@ public:
 	void create_objects();
 	void update_in_color();
 	void update_out_color();
+	void update_gui();
 	void update_shape();
+	void done_event(int result);
 
 	GradientMain *plugin;
 	BC_Title *angle_title;
@@ -210,6 +222,7 @@ public:
 	GradientOutRadius *out_radius;
 	GradientInColorButton *in_color;
 	GradientOutColorButton *out_color;
+	GradientReset *reset;
 	GradientInColorThread *in_color_thread;
 	GradientOutColorThread *out_color_thread;
 	GradientShape *shape;
@@ -271,7 +284,6 @@ public:
 	void process_package(LoadPackage *package);
 	GradientServer *server;
 	GradientMain *plugin;
-	YUV yuv;
 };
 
 class GradientServer : public LoadServer