projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a/v per track data height, boxblur power fix, add french expanders
[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 6484dc8184c1927982ad1d32ecf4ba806e380e88..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"
@@
-53,8
+52,11
@@
#include "timelinepane.inc"
#include "track.inc"
#include "trackcanvas.inc"
#include "timelinepane.inc"
#include "track.inc"
#include "trackcanvas.inc"
+#include "trackpopup.inc"
#include "trackscroll.inc"
#include "transitionpopup.inc"
#include "trackscroll.inc"
#include "transitionpopup.inc"
+#include "wintv.inc"
+#include "x10tv.inc"
#include "zoombar.inc"
#include "zoombar.inc"
@@
-78,6
+80,16
@@
public:
MButtons *mbuttons;
};
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:
class ProxyToggle : public BC_Toggle
{
public:
@@
-156,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();
@@
-163,7
+176,7
@@
public:
int menu_w();
int menu_h();
// Draw on the status bar only.
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();
void update_default_message();
void reset_default_message();
void default_message();
@@
-212,6
+225,7
@@
public:
DbWindow *db_window;
SWindow *swindow;
// Popup menus
DbWindow *db_window;
SWindow *swindow;
// Popup menus
+ TrackPopup *track_menu;
EditPopup *edit_menu;
PluginPopup *plugin_menu;
KeyframePopup *keyframe_menu;
EditPopup *edit_menu;
PluginPopup *plugin_menu;
KeyframePopup *keyframe_menu;
@@
-223,6
+237,7
@@
public:
MButtons *mbuttons;
FFMpegToggle *ffmpeg_toggle;
ProxyToggle *proxy_toggle;
MButtons *mbuttons;
FFMpegToggle *ffmpeg_toggle;
ProxyToggle *proxy_toggle;
+ StackButton *stack_button;
PaneDivider *x_divider;
PaneDivider *y_divider;
TimelinePane *pane[TOTAL_PANES];
PaneDivider *x_divider;
PaneDivider *y_divider;
TimelinePane *pane[TOTAL_PANES];
@@
-257,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