X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fgwindowgui.h;h=302417cfa0fb2227f4993d129f8b8816862d75e1;hp=f243a22879672f4e0dc867bc4f008aa52b1c600f;hb=0c086b3e7b552e0f6b06c8696d7682d9d4bd91db;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/gwindowgui.h b/cinelerra-5.1/cinelerra/gwindowgui.h
index f243a228..302417cf 100644
--- a/cinelerra-5.1/cinelerra/gwindowgui.h
+++ b/cinelerra-5.1/cinelerra/gwindowgui.h
@@ -56,7 +56,6 @@ public:
 	int translation_event();
 	int close_event();
 	int keypress_event();
-	void start_color_thread(GWindowColorButton *color_button);
 	void update_toggles(int use_lock);
 	void toggle_camera_xyz();
 	void toggle_projector_xyz();
@@ -78,7 +77,6 @@ public:
 
 	MWindow *mwindow;
 	GWindowToggle *toggles[NONAUTOTOGGLES_COUNT + AUTOMATION_TOTAL];
-	GWindowColorThread *color_thread;
 	GWindowToggle *camera_xyz, *projector_xyz;
 };
 
@@ -101,50 +99,16 @@ public:
 	GWindowColorButton *color_button;
 };
 
-class GWindowColorButton : public BC_Button
+class GWindowColorButton : public ColorCircleButton
 {
 public:
-	GWindowColorButton(GWindowToggle *auto_toggle, int x, int y, int w);
+	GWindowColorButton(GWindowToggle *auto_toggle,
+		int x, int y, int w, int color);
 	~GWindowColorButton();
-
-	void set_color(int color);
-	void update_gui(int color);
-	int handle_event();
-
-	int color;
-	VFrame *vframes[3];
-	GWindowToggle *auto_toggle;
-};
-
-class GWindowColorThread : public ColorPicker
-{
-public:
-	GWindowColorThread(GWindowGUI *gui, GWindowColorButton *color_button);
-	~GWindowColorThread();
-	void start(int color);
 	int handle_new_color(int color, int alpha);
-	void update_gui();
 	void handle_done_event(int result);
 
-	GWindowGUI *gui;
-	int color;
-	GWindowColorButton *color_button;
-	GWindowColorUpdate *color_update;
-};
-
-class GWindowColorUpdate : public Thread
-{
-public:
-	GWindowColorUpdate(GWindowColorThread *color_thread);
-	~GWindowColorUpdate();
-
-	void start();
-	void stop();
-	void run();
-
-	int done;
-	Condition *update_lock;
-	GWindowColorThread *color_thread;
+	GWindowToggle *auto_toggle;
 };
 
 #endif