X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftitler%2Ftitlerwindow.h;h=f290d7dbeda2424c886ac169f1d1aa10623e679e;hb=59e74f262d7b6be235f2bbfaac35ef4274f52dc9;hp=4dcaa6ddd8c6e9216424ab17a2fc1623f7064c66;hpb=83bfb86d01b353bab485d0ccc336e0572bcb63c6;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/titler/titlerwindow.h b/cinelerra-5.1/plugins/titler/titlerwindow.h
index 4dcaa6dd..f290d7db 100644
--- a/cinelerra-5.1/plugins/titler/titlerwindow.h
+++ b/cinelerra-5.1/plugins/titler/titlerwindow.h
@@ -24,9 +24,7 @@
 
 #include "guicast.h"
 
-class TitleThread;
 class TitleWindow;
-class TitleInterlace;
 
 #include "colorpicker.h"
 #include "dragcheckbox.h"
@@ -64,7 +62,6 @@ class TitleCenter;
 class TitleRight;class TitleTop;
 class TitleMid;
 class TitleBottom;
-class TitleColorThread;
 class TitleSpeed;
 class TitleTimecode;
 class TitleTimecodeFormat;
@@ -93,7 +90,7 @@ public:
 	void update_color();
 	void update_justification();
 	void update_stats();
-	void update();
+	void update_gui();
 	void previous_font();
 	void next_font();
 	void check_style(const char *font_name, int update);
@@ -143,10 +140,10 @@ public:
 	TitlePitch *pitch;
 	BC_Title *encoding_title;
 	TitleEncoding *encoding;
+	BC_Title *color_button_title;
 	TitleColorButton *color_button;
-	TitleColorThread *color_thread;
-	TitleOutlineColorButton *outline_color_button;
-	TitleColorThread *outline_color_thread;
+	BC_Title *outline_button_title;
+	TitleOutlineColorButton *outline_button;
 	BC_Title *motion_title;
 	TitleMotion *motion;
 	TitleLinePitch *line_pitch;
@@ -279,19 +276,21 @@ public:
 	TitleWindow *window;
 };
 
-class TitleColorButton : public BC_GenericButton
+class TitleColorButton : public ColorCircleButton
 {
 public:
 	TitleColorButton(TitleMain *client, TitleWindow *window, int x, int y);
-	int handle_event();
+	int handle_new_color(int output, int alpha);
+	void handle_done_event(int result);
 	TitleMain *client;
 	TitleWindow *window;
 };
-class TitleOutlineColorButton : public BC_GenericButton
+class TitleOutlineColorButton : public ColorCircleButton
 {
 public:
 	TitleOutlineColorButton(TitleMain *client, TitleWindow *window, int x, int y);
-	int handle_event();
+	int handle_new_color(int output, int alpha);
+	void handle_done_event(int result);
 	TitleMain *client;
 	TitleWindow *window;
 };
@@ -333,7 +332,8 @@ public:
 class TitleTimecodeFormat : public BC_PopupMenu
 {
 public:
-	TitleTimecodeFormat(TitleMain *client, TitleWindow *window, int x, int y, const char *text);
+	TitleTimecodeFormat(TitleMain *client, TitleWindow *window,
+		int x, int y, int tw, const char *text);
 	void create_objects();
 	int update(int timecode_format);
 	int handle_event();
@@ -498,16 +498,6 @@ public:
 	TitleMain *client;
 	TitleWindow *window;
 };
-class TitleColorThread : public ColorPicker
-{
-public:
-	TitleColorThread(TitleMain *client, TitleWindow *window, int is_outline);
-	virtual int handle_new_color(int output, int alpha);
-	void handle_done_event(int result);
-	TitleMain *client;
-	TitleWindow *window;
-	int is_outline;
-};
 class TitleBackground : public BC_CheckBox
 {
 public: