X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.h;h=74f353eaab785f131d75d6370196e5783cf002bf;hp=ee920186dd8fc3787edabd103b6fc6cb1c696423;hb=HEAD;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.h b/cinelerra-5.1/cinelerra/mwindowgui.h
index ee920186..74f353ea 100644
--- a/cinelerra-5.1/cinelerra/mwindowgui.h
+++ b/cinelerra-5.1/cinelerra/mwindowgui.h
@@ -42,7 +42,6 @@
 #include "pluginpopup.inc"
 #include "record.inc"
 #include "remotecontrol.h"
-#include "record.inc"
 #include "renderengine.inc"
 #include "resourcepixmap.h"
 #include "resourcethread.inc"
@@ -53,8 +52,11 @@
 #include "timelinepane.inc"
 #include "track.inc"
 #include "trackcanvas.inc"
+#include "trackpopup.inc"
 #include "trackscroll.inc"
 #include "transitionpopup.inc"
+#include "wintv.inc"
+#include "x10tv.inc"
 #include "zoombar.inc"
 
 
@@ -78,6 +80,16 @@ public:
 	MButtons *mbuttons;
 };
 
+class StackButton : public BC_GenericButton
+{
+public:
+	StackButton(MWindow *mwindow, int x, int y);
+	int handle_event();
+	void update();
+
+	MWindow *mwindow;
+};
+
 class ProxyToggle : public BC_Toggle
 {
 public:
@@ -111,9 +123,11 @@ public:
 	int focus_in_event();
 	int focus_out_event();
 
-// do_canvas - 1 for incremental drawing of resources
-//          FORCE_REDRAW for delete and redraw of resources
-//          IGNORE_THREAD to ignore picon thread
+// do_canvas -
+//   NO_DRAW disable canvas draw
+//   IGNORE_THREAD to ignore picon thread
+//   NORMAL_DRAW for incremental drawing of resources
+//   FORCE_REDRAW for delete and redraw of resources
 	void update(int scrollbars,
 		int do_canvas,
 		int timebar,
@@ -130,7 +144,7 @@ public:
 	void update_proxy_toggle();
 	void update_plugintoggles();
 	void update_scrollbars(int flush);
-	void draw_canvas(int mode, int hide_cursor);
+	void draw_canvas(int redraw, int hide_cursor);
 	void flash_canvas(int flush);
 	int show_window(int flush=1);
 	void deactivate_timeline();
@@ -147,6 +161,8 @@ public:
 	void set_meter_format(int mode, int min, int max);
 	void update_mixers(Track *track, int v);
 	void stop_transport(const char *lock_msg);
+	void close_keyvalue_popup();
+	void open_keyvalue_popup(BC_SubWindow *popup);
 
 	int translation_event();
 	int resize_event(int w, int h);          // handle a resize event
@@ -154,6 +170,7 @@ public:
 	int keyboard_listener(BC_WindowBase *wp);
 	int key_listener(int key);
 	void use_android_remote(int on);
+	int keyev_grab_remote();
 	int close_event();
 	int quit();
 	void stop_drawing();
@@ -161,7 +178,7 @@ public:
 	int menu_w();
 	int menu_h();
 // Draw on the status bar only.
-	void show_message(const char *message, int color=-1);
+	void show_message(const char *message, int msg_color=-1, int box_color=-1);
 	void update_default_message();
 	void reset_default_message();
 	void default_message();
@@ -210,6 +227,7 @@ public:
 	DbWindow *db_window;
 	SWindow *swindow;
 // Popup menus
+	TrackPopup *track_menu;
 	EditPopup *edit_menu;
 	PluginPopup *plugin_menu;
 	KeyframePopup *keyframe_menu;
@@ -221,6 +239,7 @@ public:
 	MButtons *mbuttons;
 	FFMpegToggle *ffmpeg_toggle;
 	ProxyToggle *proxy_toggle;
+	StackButton *stack_button;
 	PaneDivider *x_divider;
 	PaneDivider *y_divider;
 	TimelinePane *pane[TOTAL_PANES];
@@ -255,8 +274,10 @@ public:
 // remote control
 	AndroidControl *android_control;
 	RemoteControl *remote_control;
-	CWindowRemoteHandler *cwindow_remote_handler;
-	RecordRemoteHandler *record_remote_handler;
+	WinTV *wintv;
+	X10TV *x10tv;
+	RemoteHandler *cwindow_remote_handler;
+	RemoteHandler *record_remote_handler;
 };
 
 #endif