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=0aeb3655813a445d142329e36f7484018817ea49;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/gradient/gradient.h b/cinelerra-5.1/plugins/gradient/gradient.h
index 0aeb3655..f6d1d994 100644
--- a/cinelerra-5.1/plugins/gradient/gradient.h
+++ b/cinelerra-5.1/plugins/gradient/gradient.h
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #ifndef 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,11 +48,12 @@ public:
 	GradientConfig();
 
 	int equivalent(GradientConfig &that);
+	void reset();
 	void copy_from(GradientConfig &that);
-	void interpolate(GradientConfig &prev, 
-		GradientConfig &next, 
-		long prev_frame, 
-		long next_frame, 
+	void interpolate(GradientConfig &prev,
+		GradientConfig &next,
+		long prev_frame,
+		long next_frame,
 		long current_frame);
 // Int to hex triplet conversion
 	int get_in_color();
@@ -84,9 +85,9 @@ public:
 class GradientShape : public BC_PopupMenu
 {
 public:
-	GradientShape(GradientMain *plugin, 
+	GradientShape(GradientMain *plugin,
 		GradientWindow *gui,
-		int x, 
+		int x,
 		int y);
 	void create_objects();
 	static char* to_text(int shape);
@@ -100,8 +101,8 @@ public:
 class GradientRate : public BC_PopupMenu
 {
 public:
-	GradientRate(GradientMain *plugin, 
-		int x, 
+	GradientRate(GradientMain *plugin,
+		int x,
 		int y);
 	void create_objects();
 	static char* to_text(int shape);
@@ -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);
@@ -197,11 +207,13 @@ class GradientWindow : public PluginClientWindow
 public:
 	GradientWindow(GradientMain *plugin);
 	~GradientWindow();
-	
+
 	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