projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
png img proxy fixes, speed zoom segv fix, colapse ins 1frm silence undo, repair rende...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
mwindowgui.h
diff --git
a/cinelerra-5.1/cinelerra/mwindowgui.h
b/cinelerra-5.1/cinelerra/mwindowgui.h
index 2d5fd10cbe97d419e89532b59668b7943e79338a..5ca693e05a3760c3404e70062b8d4663cf29a876 100644
(file)
--- 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 "statusbar.inc"
#include "swindow.inc"
#include "timelinepane.inc"
+#include "track.inc"
#include "trackcanvas.inc"
#include "trackscroll.inc"
#include "transitionpopup.inc"
#include "trackcanvas.inc"
#include "trackscroll.inc"
#include "transitionpopup.inc"
@@
-77,6
+78,18
@@
public:
MButtons *mbuttons;
};
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
{
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);
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();
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 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
int translation_event();
int resize_event(int w, int h); // handle a resize event
@@
-141,6
+157,7
@@
public:
int save_defaults(BC_Hash *defaults);
int menu_w();
int menu_h();
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 update_default_message();
// Draw on the status bar only.
void show_message(const char *message, int color=-1);
void update_default_message();
@@
-201,6
+218,7
@@
public:
MainClock *mainclock;
MButtons *mbuttons;
FFMpegToggle *ffmpeg_toggle;
MainClock *mainclock;
MButtons *mbuttons;
FFMpegToggle *ffmpeg_toggle;
+ ProxyToggle *proxy_toggle;
PaneDivider *x_divider;
PaneDivider *y_divider;
TimelinePane *pane[TOTAL_PANES];
PaneDivider *x_divider;
PaneDivider *y_divider;
TimelinePane *pane[TOTAL_PANES];