X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fgwindowgui.h;h=f243a22879672f4e0dc867bc4f008aa52b1c600f;hb=0d3917a4eda0344055badf0bd6e235c15c3b6cb8;hp=35a524e8003ff4c8221e16dd9cca5fdec1954593;hpb=c4bf1f625b640ef45136dcf66b639e2a55bd8334;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/gwindowgui.h b/cinelerra-5.1/cinelerra/gwindowgui.h
index 35a524e8..f243a228 100644
--- a/cinelerra-5.1/cinelerra/gwindowgui.h
+++ b/cinelerra-5.1/cinelerra/gwindowgui.h
@@ -34,8 +34,11 @@ enum {
 	NONAUTOTOGGLES_TITLES,
 	NONAUTOTOGGLES_TRANSITIONS,
 	NONAUTOTOGGLES_PLUGIN_AUTOS,
+	NONAUTOTOGGLES_CAMERA_XYZ,
+	NONAUTOTOGGLES_PROJECTOR_XYZ,
 	NONAUTOTOGGLES_BAR1,
 	NONAUTOTOGGLES_BAR2,
+	NONAUTOTOGGLES_BAR3,
 	NONAUTOTOGGLES_COUNT
 };
 
@@ -55,36 +58,46 @@ public:
 	int keypress_event();
 	void start_color_thread(GWindowColorButton *color_button);
 	void update_toggles(int use_lock);
-	void update_mwindow();
+	void toggle_camera_xyz();
+	void toggle_projector_xyz();
+	void update_mwindow(int toggles, int overlays);
 	void load_defaults();
 	void save_defaults();
+	int *get_main_value(toggleinfo *info);
+	int check_xyz(int group);
+	void xyz_check(int group, int v);
+	void set_cool(int reset, int all=0);
+	void set_hot(GWindowToggle *toggle);
 
-	static const char *other_text[];
+	static const char *non_auto_text[];
 	static const char *auto_text[];
+	static const char *xyz_group[];
+	static const char *xyz_accel[];
 	static int auto_colors[];
+	static const char *toggle_text(toggleinfo *tp);
 
 	MWindow *mwindow;
 	GWindowToggle *toggles[NONAUTOTOGGLES_COUNT + AUTOMATION_TOTAL];
 	GWindowColorThread *color_thread;
+	GWindowToggle *camera_xyz, *projector_xyz;
 };
 
 class GWindowToggle : public BC_CheckBox
 {
 public:
-	GWindowToggle(MWindow *mwindow, GWindowGUI *gui, int x, int y,
+	GWindowToggle(GWindowGUI *gui, int x, int y,
 		const char *text, int color, toggleinfo *info);
 	~GWindowToggle();
 
 	int handle_event();
 	void update();
 	void update_gui(int color);
-
-	static int* get_main_value(MWindow *mwindow, toggleinfo *info);
+	int draw_face(int flash, int flush);
 
 	int color;
-	MWindow *mwindow;
-	GWindowGUI *gui;
+	int hot, hot_value;
 	toggleinfo *info;
+	GWindowGUI *gui;
 	GWindowColorButton *color_button;
 };
 
@@ -103,16 +116,17 @@ public:
 	GWindowToggle *auto_toggle;
 };
 
-class GWindowColorThread : public ColorThread
+class GWindowColorThread : public ColorPicker
 {
 public:
-	GWindowColorThread(GWindowColorButton *color_button);
+	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;