X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.h;h=14e0ebfe3285981c28c53c47695769e837950b72;hp=83b9243465daaed49b3e96c1ed8218ab5dc2e673;hb=32a609a6bd1181993569399ab51f314dc7cb4fba;hpb=4742c7a3793e92da3e3e46a32e1a4aa4d4c6b366

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.h b/cinelerra-5.1/cinelerra/cwindowgui.h
index 83b92434..14e0ebfe 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();
@@ -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;
@@ -256,9 +263,8 @@ class CWindowTransport : public PlayTransport
 {
 public:
 	CWindowTransport(MWindow *mwindow,
-		CWindowGUI *gui,
-		int x,
-		int y);
+		CWindowGUI *gui, int x, int y);
+	bool use_mixers() { return true; }
 	EDL* get_edl();
 	void goto_start();
 	void goto_end();
@@ -278,6 +284,8 @@ 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,
@@ -310,7 +318,7 @@ public:
 	void reset_camera();
 	void reset_projector();
 	void draw_crophandle(int x, int y);
-	void zoom_auto();
+	int set_fullscreen(int on, int unlock);
 
 // Draw the camera/projector overlay in different colors.
 	void draw_outlines(int do_camera);
@@ -318,9 +326,12 @@ public:
 	void calculate_origin();
 	void toggle_controls();
 	int get_cwindow_controls();
+	int get_clear_color();
 
 	MWindow *mwindow;
 	CWindowGUI *gui;
+	float last_xscroll, last_yscroll;
+	float last_zoom;
 };
 
 #endif