projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update, fix vaapi spelling, zoom fixes
[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 af8474541d9f199cc75856848fe7c4d7d89b05a5..7dbfde86142c4d7e9157965069eade20b1fec116 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();
@@
-280,6
+285,8
@@
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 do_eyedrop(int &rerender, int button_press, int draw);
int do_mask(int &redraw,
int &rerender,
@@
-312,7
+319,7
@@
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 set_fullscreen(int on, int unlock
);
// 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);
@@
-320,9
+327,12
@@
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;
+ float last_xscroll, last_yscroll;
+ float last_zoom;
};
#endif
};
#endif