projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework canvas zoom, add 3 plugins from 7.2, tweak cwdw boundry, vdevicex11 dupl close...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
cwindowgui.h
diff --git
a/cinelerra-5.1/cinelerra/cwindowgui.h
b/cinelerra-5.1/cinelerra/cwindowgui.h
index 33cf9bf6bafb7823800112e78269b25cffdeed82..2930efa0c6921c9abd3449e9007a98eca1660666 100644
(file)
--- a/
cinelerra-5.1/cinelerra/cwindowgui.h
+++ b/
cinelerra-5.1/cinelerra/cwindowgui.h
@@
-54,6
+54,12
@@
class CWindowEditing;
#define AUTO_ZOOM N_("Auto")
#define AUTO_ZOOM N_("Auto")
+#define CROP_REFORMAT 0
+#define CROP_RESIZE 1
+#define CROP_SHRINK 2
+#define CROP_MODES 3
+
+
class CWindowGUI : public BC_Window
{
public:
class CWindowGUI : public BC_Window
{
public:
@@
-62,8
+68,7
@@
public:
void create_objects();
int resize_event(int w, int h);
void create_objects();
int resize_event(int w, int h);
- void zoom_canvas(double value, int update_menu);
- float get_auto_zoom();
+ void update_canvas(int redraw=1);
// Events for the fullscreen canvas fall through to here.
int button_press_event();
// Events for the fullscreen canvas fall through to here.
int button_press_event();
@@
-101,6
+106,7
@@
public:
CTimeBar *timebar;
BC_Pixmap *active;
BC_Pixmap *inactive;
CTimeBar *timebar;
BC_Pixmap *active;
BC_Pixmap *inactive;
+ VFrame *focus_frame;
// MainClock *clock;
// MainClock *clock;
@@
-186,6
+192,7
@@
public:
void panel_fit_autos(int all);
void panel_set_editing_mode(int mode);
void panel_set_auto_keyframes(int v);
void panel_fit_autos(int all);
void panel_set_editing_mode(int mode);
void panel_set_auto_keyframes(int v);
+ void panel_set_span_keyframes(int v);
void panel_set_labels_follow_edits(int v);
MWindow *mwindow;
void panel_set_labels_follow_edits(int v);
MWindow *mwindow;
@@
-278,12
+285,15
@@
public:
int get_xscroll();
int get_yscroll();
float get_zoom();
int get_xscroll();
int get_yscroll();
float get_zoom();
+ void zoom_auto();
+ int do_scroll(EDL *edl, float cursor_x, float cursor_y);
int do_eyedrop(int &rerender, int button_press, int draw);
int do_mask(int &redraw,
int &rerender,
int button_press,
int cursor_motion,
int draw);
int do_eyedrop(int &rerender, int button_press, int draw);
int do_mask(int &redraw,
int &rerender,
int button_press,
int cursor_motion,
int draw);
+ int do_mask_focus();
void draw_refresh(int flash = 1);
int need_overlays();
void draw_overlays();
void draw_refresh(int flash = 1);
int need_overlays();
void draw_overlays();
@@
-309,7
+319,9
@@
public:
void reset_camera();
void reset_projector();
void draw_crophandle(int x, int y);
void reset_camera();
void reset_projector();
void draw_crophandle(int x, int y);
- void zoom_auto();
+ int use_fullscreen(int on);
+ void start_fullscreen();
+ void stop_fullscreen();
// Draw the camera/projector overlay in different colors.
void draw_outlines(int do_camera);
// Draw the camera/projector overlay in different colors.
void draw_outlines(int do_camera);
@@
-317,6
+329,7
@@
public:
void calculate_origin();
void toggle_controls();
int get_cwindow_controls();
void calculate_origin();
void toggle_controls();
int get_cwindow_controls();
+ int get_clear_color();
MWindow *mwindow;
CWindowGUI *gui;
MWindow *mwindow;
CWindowGUI *gui;