X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.h;h=8753fa43b1a4a5ee30cb9f10a58dc1e3fbf3760a;hp=931047e599f6d621a5ff38c26a86ee77dacfe017;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hpb=a4de4732339bf38b5b225c533be1bdf60748f04a

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.h b/cinelerra-5.1/cinelerra/cwindowgui.h
index 931047e5..8753fa43 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.h
+++ b/cinelerra-5.1/cinelerra/cwindowgui.h
@@ -60,8 +60,10 @@ public:
 	CWindowGUI(MWindow *mwindow, CWindow *cwindow);
 	~CWindowGUI();
 
-    void create_objects();
+	void create_objects();
 	int resize_event(int w, int h);
+	void zoom_canvas(double value, int update_menu);
+	float get_auto_zoom();
 
 // Events for the fullscreen canvas fall through to here.
 	int button_press_event();
@@ -70,9 +72,6 @@ public:
 	int button_release_event();
 	int cursor_motion_event();
 
-
-	void zoom_canvas(int do_auto, double value, int update_menu);
-
 	int close_event();
 	int keypress_event();
 	int translation_event();
@@ -86,6 +85,7 @@ public:
 	void keyboard_zoomin();
 	void keyboard_zoomout();
 	void update_meters();
+	void stop_transport(const char *lock_msg);
 
 	MWindow *mwindow;
 	CWindow *cwindow;
@@ -149,7 +149,6 @@ public:
 // Origin for camera and projector operations during last button press
 	float center_x, center_y, center_z;
 	float control_in_x, control_in_y, control_out_x, control_out_y;
-	int current_tool;
 // Must recalculate the origin when pressing shift.
 // Switch toggle on and off to recalculate origin.
 	int translating_zoom;
@@ -168,14 +167,13 @@ public:
 	void overwrite_selection();
 	void set_inpoint();
 	void set_outpoint();
-	void clear_inpoint();
-	void clear_outpoint();
+	void unset_inoutpoint();
 	void to_clip();
 	void toggle_label();
-	void prev_label();
-	void next_label();
-	void prev_edit();
-	void next_edit();
+	void prev_label(int cut);
+	void next_label(int cut);
+	void prev_edit(int cut);
+	void next_edit(int cut);
 
 	MWindow *mwindow;
 	CWindow *cwindow;
@@ -200,6 +198,7 @@ public:
 	CWindowZoom(MWindow *mwindow, CWindowGUI *gui, int x, int y, int w);
 	virtual ~CWindowZoom();
 	int handle_event();
+	void update(double value);
 	MWindow *mwindow;
 	CWindowGUI *gui;
 };