X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.h;h=14e0ebfe3285981c28c53c47695769e837950b72;hb=9e3d90a964c0fbe97c0b58235336a47111932d5d;hp=45734e4259603e74d5ed66b57761125ba12d02f5;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.h b/cinelerra-5.1/cinelerra/cwindowgui.h
index 45734e42..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();
@@ -86,6 +91,7 @@ public:
 	void keyboard_zoomout();
 	void update_meters();
 	void stop_transport(const char *lock_msg);
+	void sync_parameters(int change_type, int redraw=0, int overlay=0);
 
 	MWindow *mwindow;
 	CWindow *cwindow;
@@ -100,6 +106,7 @@ public:
 	CTimeBar *timebar;
 	BC_Pixmap *active;
 	BC_Pixmap *inactive;
+	VFrame *focus_frame;
 //	MainClock *clock;
 
 
@@ -162,18 +169,31 @@ public:
 	CWindowEditing(MWindow *mwindow, CWindow *cwindow);
 	virtual ~CWindowEditing() {}
 
-	void copy_selection();
-	void splice_selection();
-	void overwrite_selection();
-	void set_inpoint();
-	void set_outpoint();
-	void unset_inoutpoint();
-	void to_clip();
-	void toggle_label();
-	void prev_label(int cut);
-	void next_label(int cut);
-	void prev_edit(int cut);
-	void next_edit(int cut);
+	double get_position();
+	void set_position(double position);
+	void set_click_to_play(int v);
+
+	void panel_stop_transport();
+	void panel_toggle_label();
+	void panel_next_label(int cut);
+	void panel_prev_label(int cut);
+	void panel_prev_edit(int cut);
+	void panel_next_edit(int cut);
+	void panel_copy_selection();
+	void panel_overwrite_selection();
+	void panel_splice_selection();
+	void panel_set_inpoint();
+	void panel_set_outpoint();
+	void panel_unset_inoutpoint();
+	void panel_to_clip();
+	void panel_cut();
+	void panel_paste();
+	void panel_fit_selection();
+	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;
 	CWindow *cwindow;
@@ -243,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();
@@ -265,12 +284,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();
@@ -281,8 +303,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,
@@ -291,21 +311,27 @@ public:
 		int do_camera);
 	int do_ruler(int draw, int motion, int button_press, int button_release);
 	int test_zoom(int &redraw);
+	void create_keyframe(int do_camera);
+	void camera_keyframe();
+	void projector_keyframe();
+	void reset_keyframe(int do_camera);
 	void reset_camera();
 	void reset_projector();
-	void reset_keyframe(int do_camera);
 	void draw_crophandle(int x, int y);
-	void zoom_auto();
+	int set_fullscreen(int on, int unlock);
 
-// 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;
+	float last_xscroll, last_yscroll;
+	float last_zoom;
 };
 
 #endif