X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.h;h=480663981dfdcdae24e9aa306aea562e25baedef;hp=6d02bf67970eeb45fa28f3873d1a7f775cff431c;hb=54b918a8b84f666bf32548ebd12b93908061d2a6;hpb=78871039cd6acf5ec257bd8c8e94c83ef81dc45a

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h
index 6d02bf67..48066398 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.h
+++ b/cinelerra-5.1/cinelerra/cwindowtool.h
@@ -90,8 +90,10 @@ public:
 	virtual void handle_event() {};
 // Update text boxes from keyframe here
 	virtual void update() {};
+
 // Update EDL and preview only
 	void update_preview(int changed_edl=0);
+	void update_auto(Track *track, int idx, CWindowCoord *vp);
 	void draw_preview(int changed_edl);
 	int current_operation;
 	virtual int close_event();
@@ -102,22 +104,73 @@ public:
 	MWindow *mwindow;
 	CWindowTool *thread;
 	CWindowCoord *event_caller;
+	int edge, span;
 };
 
 class CWindowCoord : public BC_TumbleTextBox
 {
 public:
-	CWindowCoord(CWindowToolGUI *gui, int x, int y,
-			float value, int logincrement);
-	CWindowCoord(CWindowToolGUI *gui, int x, int y,
-			int value);
-
+	CWindowCoord(CWindowToolGUI *gui, int x, int y, float value, int group=-1);
+	CWindowCoord(CWindowToolGUI *gui, int x, int y, int value, int group=-1);
+	void create_objects();
+	void update_gui(float value);
 // Calls the window's handle_event
 	int handle_event();
 
 	CWindowToolGUI *gui;
+	int type;
+	CWindowToolAutoRangeTumbler *min_tumbler;
+	CWindowCoordSlider *slider;
+	CWindowToolAutoRangeTumbler *max_tumbler;
+	CWindowToolAutoRangeReset *range_reset;
+	CWindowToolAutoRangeTextBox *range_text;
+	CWindowCoordRangeTumbler *range;
+};
+
+class CWindowCoordSlider : public BC_FSlider
+{
+public:
+	CWindowCoordSlider(CWindowCoord *coord, int x, int y, int w,
+		float mn, float mx, float value);
+	~CWindowCoordSlider();
+	int handle_event();
+
+	CWindowCoord *coord;
+};
+
+class CWindowCoordRangeTumbler : public BC_Tumbler
+{
+public:
+	CWindowCoordRangeTumbler(CWindowCoord *coord, int x, int y);
+	~CWindowCoordRangeTumbler();
+	int update(float scale);
+	int handle_up_event();
+	int handle_down_event();
+
+	CWindowCoord *coord;
+};
+
+class CWindowCurveAutoEdge : public BC_Toggle
+{
+public:
+	CWindowCurveAutoEdge(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	int handle_event();
+
+	MWindow *mwindow;
+	CWindowToolGUI *gui;
+};
+
+class CWindowCurveAutoSpan : public BC_Toggle
+{
+public:
+	CWindowCurveAutoSpan(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+
+	int handle_event();
+	MWindow *mwindow;
+	CWindowToolGUI *gui;
 };
 
+
 class CWindowCropApply : public BC_GenericButton
 {
 public:
@@ -755,6 +808,38 @@ public:
 };
 
 
+class CWindowToolAutoRangeTumbler : public BC_Tumbler
+{
+public:
+	CWindowToolAutoRangeTumbler(CWindowCoord *coord, int x, int y,
+			int use_max, const char *tip);
+	int handle_up_event();
+	int handle_down_event();
+
+	CWindowCoord *coord;
+	int use_max;
+};
+
+class CWindowToolAutoRangeReset : public BC_Button
+{
+public:
+	CWindowToolAutoRangeReset(CWindowCoord *coord, int x, int y);
+	int handle_event();
+
+	CWindowCoord *coord;
+};
+
+class CWindowToolAutoRangeTextBox : public BC_TextBox
+{
+public:
+	CWindowToolAutoRangeTextBox(CWindowCoord *coord, int x, int y);
+	int button_press_event();
+	int handle_event();
+	int update_range();
+
+	CWindowCoord *coord;
+};
+
 
 class CWindowCameraGUI : public CWindowToolGUI
 {
@@ -765,10 +850,14 @@ public:
 	void create_objects();
 	void update();
 
+	BC_TitleBar *bar1, *bar2;
 	CWindowCoord *x, *y, *z;
 	CWindowCameraAddKeyframe *add_keyframe;
 	CWindowCameraReset *reset;
-	CWindowCurveToggle *t_smooth, *t_linear;
+	BC_TitleBar *bar3, *bar4, *bar5;
+	CWindowCurveToggle *t_smooth, *t_linear, *t_tangent, *t_free, *t_bump;
+	CWindowCurveAutoSpan *auto_span;
+	CWindowCurveAutoEdge *auto_edge;
 };
 
 class CWindowCameraLeft : public BC_Button
@@ -861,10 +950,14 @@ public:
 	void create_objects();
 	void update();
 
+	BC_TitleBar *bar1, *bar2;
 	CWindowCoord *x, *y, *z;
 	CWindowProjectorAddKeyframe *add_keyframe;
 	CWindowProjectorReset *reset;
-	CWindowCurveToggle *t_smooth, *t_linear;
+	BC_TitleBar *bar3, *bar4, *bar5;
+	CWindowCurveToggle *t_smooth, *t_linear, *t_tangent, *t_free, *t_bump;
+	CWindowCurveAutoSpan *auto_span;
+	CWindowCurveAutoEdge *auto_edge;
 };
 
 class CWindowProjectorLeft : public BC_Button