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=68e0a4f7707fcab015a1029b6b04a5db459a77a4;hb=HEAD;hpb=61298e645e43da02c939e9512949f0b183542d58

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.h b/cinelerra-5.1/cinelerra/mwindowgui.h
index 68e0a4f7..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"
@@ -56,6 +55,8 @@
 #include "trackpopup.inc"
 #include "trackscroll.inc"
 #include "transitionpopup.inc"
+#include "wintv.inc"
+#include "x10tv.inc"
 #include "zoombar.inc"
 
 
@@ -79,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:
@@ -150,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
@@ -157,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();
@@ -225,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];
@@ -259,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