X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.h;h=2930efa0c6921c9abd3449e9007a98eca1660666;hb=0e16112661802284c0d2c9eb8d1df84141125e91;hp=01ff0cebdbfc69d451a9dd74c9513fe1be75e45b;hpb=2778975bea06a53d8165a5e37bdacde1ae5f3320;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.h b/cinelerra-5.1/cinelerra/cwindowgui.h
index 01ff0ceb..2930efa0 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.h
+++ b/cinelerra-5.1/cinelerra/cwindowgui.h
@@ -54,6 +54,12 @@ class CWindowEditing;
 
 #define AUTO_ZOOM N_("Auto")
 
+#define CROP_REFORMAT 0
+#define CROP_RESIZE 1
+#define CROP_SHRINK 2
+#define CROP_MODES 3
+
+
 class CWindowGUI : public BC_Window
 {
 public:
@@ -62,8 +68,7 @@ public:
 
 	void create_objects();
 	int resize_event(int w, int h);
-	void zoom_canvas(double value, int update_menu);
-	float get_auto_zoom();
+	void update_canvas(int redraw=1);
 
 // Events for the fullscreen canvas fall through to here.
 	int button_press_event();
@@ -86,7 +91,7 @@ public:
 	void keyboard_zoomout();
 	void update_meters();
 	void stop_transport(const char *lock_msg);
-	void sync_parameters(int change_type, int tool=0, int overlay=0);
+	void sync_parameters(int change_type, int redraw=0, int overlay=0);
 
 	MWindow *mwindow;
 	CWindow *cwindow;
@@ -101,6 +106,7 @@ public:
 	CTimeBar *timebar;
 	BC_Pixmap *active;
 	BC_Pixmap *inactive;
+	VFrame *focus_frame;
 //	MainClock *clock;
 
 
@@ -186,6 +192,7 @@ public:
 	void panel_fit_autos(int all);
 	void panel_set_editing_mode(int mode);
 	void panel_set_auto_keyframes(int v);
+	void panel_set_span_keyframes(int v);
 	void panel_set_labels_follow_edits(int v);
 
 	MWindow *mwindow;
@@ -278,12 +285,15 @@ public:
 	int get_xscroll();
 	int get_yscroll();
 	float get_zoom();
+	void zoom_auto();
+	int do_scroll(EDL *edl, float cursor_x, float cursor_y);
 	int do_eyedrop(int &rerender, int button_press, int draw);
 	int do_mask(int &redraw,
 		int &rerender,
 		int button_press,
 		int cursor_motion,
 		int draw);
+	int do_mask_focus();
 	void draw_refresh(int flash = 1);
 	int need_overlays();
 	void draw_overlays();
@@ -294,8 +304,6 @@ public:
 	int cursor_motion_event();
 	int button_press_event();
 	int button_release_event();
-	int get_fullscreen();
-	void set_fullscreen(int value);
 	int test_crop(int button_press, int &redraw);
 	int test_bezier(int button_press,
 		int &redraw,
@@ -311,14 +319,17 @@ public:
 	void reset_camera();
 	void reset_projector();
 	void draw_crophandle(int x, int y);
-	void zoom_auto();
+	int use_fullscreen(int on);
+	void start_fullscreen();
+	void stop_fullscreen();
 
-// Draw the projector overlay in different colors.
-	void draw_bezier(int do_camera);
+// Draw the camera/projector overlay in different colors.
+	void draw_outlines(int do_camera);
 	void draw_crop();
 	void calculate_origin();
 	void toggle_controls();
 	int get_cwindow_controls();
+	int get_clear_color();
 
 	MWindow *mwindow;
 	CWindowGUI *gui;