X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.h;h=d4205162e380d6580b6d1219dc74e4f5a1fb014d;hp=5b8d6bfee937f592c84c3ef983a4e889df35ec2a;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hpb=6f8a01f30489bde88280931c3ef9ea4edeb44d0f

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.h b/cinelerra-5.1/cinelerra/mwindowgui.h
index 5b8d6bfe..d4205162 100644
--- a/cinelerra-5.1/cinelerra/mwindowgui.h
+++ b/cinelerra-5.1/cinelerra/mwindowgui.h
@@ -51,6 +51,7 @@
 #include "statusbar.inc"
 #include "swindow.inc"
 #include "timelinepane.inc"
+#include "track.inc"
 #include "trackcanvas.inc"
 #include "trackscroll.inc"
 #include "transitionpopup.inc"
@@ -77,6 +78,18 @@ public:
 	MButtons *mbuttons;
 };
 
+class ProxyToggle : public BC_Toggle
+{
+public:
+	ProxyToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y);
+	~ProxyToggle();
+	int handle_event();
+	int keypress_event();
+
+	MWindow *mwindow;
+	MButtons *mbuttons;
+};
+
 
 class MWindowGUI : public BC_Window
 {
@@ -111,10 +124,12 @@ public:
 	void update_timebar(int flush_it);
 	void update_timebar_highlights();
 	void update_patchbay();
+	void update_proxy_toggle();
 	void update_plugintoggles();
 	void update_scrollbars(int flush);
 	void draw_canvas(int mode, int hide_cursor);
 	void flash_canvas(int flush);
+	int show_window(int flush=1);
 	void deactivate_timeline();
 	void activate_timeline();
 	void reset_meters();
@@ -127,9 +142,10 @@ public:
 	void set_playing_back(int value);
 	void set_editing_mode(int flush);
 	void set_meter_format(int mode, int min, int max);
+	void update_mixers(Track *track, int v);
+	void stop_transport(const char *lock_msg);
 
 	int translation_event();
-	int cursor_enter_event();
 	int resize_event(int w, int h);          // handle a resize event
 	int button_release_event();
 	int keypress_event();
@@ -143,11 +159,10 @@ public:
 	int menu_w();
 	int menu_h();
 // Draw on the status bar only.
-	void show_message(const char *message, int color = -1);
-	void set_default_message(const char *message);
+	void show_message(const char *message, int color=-1);
+	void update_default_message();
 	void reset_default_message();
 	void default_message();
-// Pop up a box if the statusbar is taken and show an error.
 	void show_error(char *message, int color = BLACK);
 	int repeat_event(int64_t duration);
 // Entry point for drag events in all windows
@@ -203,6 +218,7 @@ public:
 	MainClock *mainclock;
 	MButtons *mbuttons;
 	FFMpegToggle *ffmpeg_toggle;
+	ProxyToggle *proxy_toggle;
 	PaneDivider *x_divider;
 	PaneDivider *y_divider;
 	TimelinePane *pane[TOTAL_PANES];