projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add VFrameJpeg for shapewipe shapes, switch to jpeg for shapes, cam/prjr x,y,z range...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mwindowgui.h
diff --git
a/cinelerra-5.1/cinelerra/mwindowgui.h
b/cinelerra-5.1/cinelerra/mwindowgui.h
index 4ba7c16ebe164cad80855f04d9ba90d37a791fde..bc3aa3a65ff2d64bb5e13fd3a7ebd5a7c87b5500 100644
(file)
--- 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 "pluginpopup.inc"
#include "record.inc"
#include "remotecontrol.h"
-#include "record.inc"
#include "renderengine.inc"
#include "resourcepixmap.h"
#include "resourcethread.inc"
#include "renderengine.inc"
#include "resourcepixmap.h"
#include "resourcethread.inc"
@@
-56,6
+55,8
@@
#include "trackpopup.inc"
#include "trackscroll.inc"
#include "transitionpopup.inc"
#include "trackpopup.inc"
#include "trackscroll.inc"
#include "transitionpopup.inc"
+#include "wintv.inc"
+#include "x10tv.inc"
#include "zoombar.inc"
#include "zoombar.inc"
@@
-167,6
+168,7
@@
public:
int keyboard_listener(BC_WindowBase *wp);
int key_listener(int key);
void use_android_remote(int on);
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();
int close_event();
int quit();
void stop_drawing();
@@
-270,8
+272,10
@@
public:
// remote control
AndroidControl *android_control;
RemoteControl *remote_control;
// 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
};
#endif