X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.h;h=6d02bf67970eeb45fa28f3873d1a7f775cff431c;hb=78871039cd6acf5ec257bd8c8e94c83ef81dc45a;hp=1a116541200f9f4b1bfb6f9937142dd2504e65ea;hpb=33aae273918725085d841a8af927bfccd2aa9364;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h
index 1a116541..6d02bf67 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.h
+++ b/cinelerra-5.1/cinelerra/cwindowtool.h
@@ -97,6 +97,7 @@ public:
 	virtual int close_event();
 	int keypress_event();
 	int translation_event();
+	int press(void (CWindowCanvas::*fn)());
 
 	MWindow *mwindow;
 	CWindowTool *thread;
@@ -760,15 +761,13 @@ class CWindowCameraGUI : public CWindowToolGUI
 public:
 	CWindowCameraGUI(MWindow *mwindow, CWindowTool *thread);
 	~CWindowCameraGUI();
+	void handle_event();
 	void create_objects();
 	void update();
 
-// Update the keyframe from text boxes
-	void handle_event();
-//	BezierAuto* get_keyframe();
 	CWindowCoord *x, *y, *z;
-private:
-// Toggles for keyframe curve mode (for camera automation only)
+	CWindowCameraAddKeyframe *add_keyframe;
+	CWindowCameraReset *reset;
 	CWindowCurveToggle *t_smooth, *t_linear;
 };
 
@@ -832,18 +831,39 @@ public:
 	CWindowCameraGUI *gui;
 };
 
+class CWindowCameraAddKeyframe : public BC_Button
+{
+public:
+	CWindowCameraAddKeyframe(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowToolGUI *gui;
+};
+
+class CWindowCameraReset : public BC_Button
+{
+public:
+	CWindowCameraReset(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowToolGUI *gui;
+};
+
+
 class CWindowProjectorGUI : public CWindowToolGUI
 {
 public:
 	CWindowProjectorGUI(MWindow *mwindow, CWindowTool *thread);
 	~CWindowProjectorGUI();
+	void handle_event();
 	void create_objects();
 	void update();
-	void handle_event();
-//	BezierAuto* get_keyframe();
+
 	CWindowCoord *x, *y, *z;
-private:
-// Toggles for keyframe curve mode (projector automation only)
+	CWindowProjectorAddKeyframe *add_keyframe;
+	CWindowProjectorReset *reset;
 	CWindowCurveToggle *t_smooth, *t_linear;
 };
 
@@ -907,6 +927,26 @@ public:
 	CWindowProjectorGUI *gui;
 };
 
+class CWindowProjectorAddKeyframe : public BC_Button
+{
+public:
+	CWindowProjectorAddKeyframe(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowToolGUI *gui;
+};
+
+class CWindowProjectorReset : public BC_Button
+{
+public:
+	CWindowProjectorReset(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowToolGUI *gui;
+};
+
 
 
 
@@ -929,5 +969,4 @@ public:
 };
 
 
-
 #endif