projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xyz toggle camera/projector, single frame proxy fix, neophyte size fix, shortcuts...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
gwindowgui.h
diff --git
a/cinelerra-5.1/cinelerra/gwindowgui.h
b/cinelerra-5.1/cinelerra/gwindowgui.h
index 8a347d6c3cd03dee2335a492166c26793bce6c4b..bde6fa7ddc7a30f5c1abaab21392111fd4a15c98 100644
(file)
--- a/
cinelerra-5.1/cinelerra/gwindowgui.h
+++ b/
cinelerra-5.1/cinelerra/gwindowgui.h
@@
-34,8
+34,11
@@
enum {
NONAUTOTOGGLES_TITLES,
NONAUTOTOGGLES_TRANSITIONS,
NONAUTOTOGGLES_PLUGIN_AUTOS,
NONAUTOTOGGLES_TITLES,
NONAUTOTOGGLES_TRANSITIONS,
NONAUTOTOGGLES_PLUGIN_AUTOS,
+ NONAUTOTOGGLES_CAMERA_XYZ,
+ NONAUTOTOGGLES_PROJECTOR_XYZ,
NONAUTOTOGGLES_BAR1,
NONAUTOTOGGLES_BAR2,
NONAUTOTOGGLES_BAR1,
NONAUTOTOGGLES_BAR2,
+ NONAUTOTOGGLES_BAR3,
NONAUTOTOGGLES_COUNT
};
NONAUTOTOGGLES_COUNT
};
@@
-55,17
+58,26
@@
public:
int keypress_event();
void start_color_thread(GWindowColorButton *color_button);
void update_toggles(int use_lock);
int keypress_event();
void start_color_thread(GWindowColorButton *color_button);
void update_toggles(int use_lock);
+ void toggle_camera_xyz();
+ void toggle_projector_xyz();
void update_mwindow();
void load_defaults();
void save_defaults();
void update_mwindow();
void load_defaults();
void save_defaults();
+ int *get_main_value(toggleinfo *info);
+ int check_xyz(int group);
+ void xyz_check(int group, int v);
- static const char *
other
_text[];
+ static const char *
non_auto
_text[];
static const char *auto_text[];
static const char *auto_text[];
+ static const char *xyz_group[];
+ static const char *xyz_accel[];
static int auto_colors[];
static int auto_colors[];
+ static const char *toggle_text(toggleinfo *tp);
MWindow *mwindow;
GWindowToggle *toggles[NONAUTOTOGGLES_COUNT + AUTOMATION_TOTAL];
GWindowColorThread *color_thread;
MWindow *mwindow;
GWindowToggle *toggles[NONAUTOTOGGLES_COUNT + AUTOMATION_TOTAL];
GWindowColorThread *color_thread;
+ GWindowToggle *camera_xyz, *projector_xyz;
};
class GWindowToggle : public BC_CheckBox
};
class GWindowToggle : public BC_CheckBox
@@
-79,8
+91,6
@@
public:
void update();
void update_gui(int color);
void update();
void update_gui(int color);
- static int* get_main_value(MWindow *mwindow, toggleinfo *info);
-
int color;
toggleinfo *info;
GWindowGUI *gui;
int color;
toggleinfo *info;
GWindowGUI *gui;