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

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.h b/cinelerra-5.1/cinelerra/cwindowgui.h
index a5d18926..8753fa43 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.h
+++ b/cinelerra-5.1/cinelerra/cwindowgui.h
@@ -62,7 +62,7 @@ public:
 
 	void create_objects();
 	int resize_event(int w, int h);
-	void zoom_canvas(int do_auto, double value, int update_menu);
+	void zoom_canvas(double value, int update_menu);
 	float get_auto_zoom();
 
 // Events for the fullscreen canvas fall through to here.
@@ -85,6 +85,7 @@ public:
 	void keyboard_zoomin();
 	void keyboard_zoomout();
 	void update_meters();
+	void stop_transport(const char *lock_msg);
 
 	MWindow *mwindow;
 	CWindow *cwindow;
@@ -148,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;
@@ -167,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;
@@ -199,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;
 };