X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.h;h=5ca693e05a3760c3404e70062b8d4663cf29a876;hb=5621db270ccbeabc106e0f438941dba6f930652b;hp=de21ee819e1d7668c2a616216112044ed22ea39a;hpb=4b6c39e6cf4a3fd9c1b347db6de686ab55d6cac8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.h b/cinelerra-5.1/cinelerra/mwindowgui.h
index de21ee81..5ca693e0 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
 {
@@ -115,6 +128,7 @@ public:
 	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,6 +141,8 @@ 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 resize_event(int w, int h);          // handle a resize event
@@ -141,12 +157,12 @@ public:
 	int save_defaults(BC_Hash *defaults);
 	int menu_w();
 	int menu_h();
+	int mbuttons_w();
 // 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
@@ -202,6 +218,7 @@ public:
 	MainClock *mainclock;
 	MButtons *mbuttons;
 	FFMpegToggle *ffmpeg_toggle;
+	ProxyToggle *proxy_toggle;
 	PaneDivider *x_divider;
 	PaneDivider *y_divider;
 	TimelinePane *pane[TOTAL_PANES];