X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.h;h=0d79d8707f67dbc0aa411fe3a3eb81751ce23022;hp=7dbfde86142c4d7e9157965069eade20b1fec116;hb=refs%2Fheads%2Fmaster;hpb=98e035865979cda9805a58a85d52f8d70a7ec54e

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.h b/cinelerra-5.1/cinelerra/cwindowgui.h
index 7dbfde86..0d79d870 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.h
+++ b/cinelerra-5.1/cinelerra/cwindowgui.h
@@ -27,6 +27,7 @@
 #include "cpanel.inc"
 #include "ctimebar.inc"
 #include "cwindow.inc"
+#include "cwindowgui.inc"
 #include "cwindowtool.inc"
 #include "editpanel.h"
 #include "floatauto.inc"
@@ -42,15 +43,6 @@
 #include "track.inc"
 #include "zoompanel.h"
 
-class CWindowZoom;
-class CWindowSlider;
-class CWindowReset;
-class CWindowDestination;
-class CWindowMeters;
-class CWindowTransport;
-class CWindowCanvas;
-class CWindowEditing;
-
 
 #define AUTO_ZOOM N_("Auto")
 
@@ -194,6 +186,7 @@ public:
 	void panel_set_auto_keyframes(int v);
 	void panel_set_span_keyframes(int v);
 	void panel_set_labels_follow_edits(int v);
+	void panel_set_gang_tracks(int v);
 
 	MWindow *mwindow;
 	CWindow *cwindow;
@@ -249,23 +242,12 @@ public:
 	MWindow *mwindow;
 };
 
-// class CWindowDestination : public BC_PopupTextBox
-// {
-// public:
-// 	CWindowDestination(MWindow *mwindow, CWindowGUI *cwindow, int x, int y);
-// 	~CWindowDestination();
-// 	int handle_event();
-// 	CWindowGUI *cwindow;
-// 	MWindow *mwindow;
-// };
-
 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();
@@ -273,12 +255,21 @@ public:
 	CWindowGUI *gui;
 };
 
+class CWindowCanvasToggleControls : public BC_MenuItem
+{
+public:
+	CWindowCanvasToggleControls(CWindowCanvas *canvas);
+	int handle_event();
+	static const char *calculate_text(int cwindow_controls);
+	CWindowCanvas *canvas;
+};
 
 class CWindowCanvas : public Canvas
 {
 public:
 	CWindowCanvas(MWindow *mwindow, CWindowGUI *gui);
 
+	void create_objects(EDL *edl);
 	void status_event();
 	void zoom_resize_window(float percentage);
 	void update_zoom(int x, int y, float zoom);
@@ -288,11 +279,8 @@ public:
 	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(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();
@@ -306,10 +294,7 @@ public:
 	int button_release_event();
 	int test_crop(int button_press, int &redraw);
 	int test_bezier(int button_press,
-		int &redraw,
-		int &redraw_canvas,
-		int &rerender,
-		int do_camera);
+		int &redraw, int &redraw_canvas, int &rerender, 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);
@@ -320,17 +305,20 @@ public:
 	void reset_projector();
 	void draw_crophandle(int x, int y);
 	int set_fullscreen(int on, int unlock);
+	int scope_on();
+	void draw_scope(VFrame *output, int refresh);
 
 // 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();
+	int get_controls();
+	void toggle_controls();
 
 	MWindow *mwindow;
 	CWindowGUI *gui;
+	CWindowCanvasToggleControls *controls;
 	float last_xscroll, last_yscroll;
 	float last_zoom;
 };