projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
olaf neophyte and de.po updates, valgrind tweaks, delete green lady, inkscape dpi=96
[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..f243a22879672f4e0dc867bc4f008aa52b1c600f 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,28
@@
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 update_mwindow();
+ void toggle_camera_xyz();
+ void toggle_projector_xyz();
+ void update_mwindow(int toggles, int overlays);
void load_defaults();
void save_defaults();
void load_defaults();
void save_defaults();
+ int *get_main_value(toggleinfo *info);
+ int check_xyz(int group);
+ void xyz_check(int group, int v);
+ void set_cool(int reset, int all=0);
+ void set_hot(GWindowToggle *toggle);
- 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
@@
-78,10
+92,10
@@
public:
int handle_event();
void update();
void update_gui(int color);
int handle_event();
void update();
void update_gui(int color);
-
- static int* get_main_value(MWindow *mwindow, toggleinfo *info);
+ int draw_face(int flash, int flush);
int color;
int color;
+ int hot, hot_value;
toggleinfo *info;
GWindowGUI *gui;
GWindowColorButton *color_button;
toggleinfo *info;
GWindowGUI *gui;
GWindowColorButton *color_button;