projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x265 upgrade to 2.5, cinfinity cc lic, keyframe reticle redraw, crikey/titler event...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
interfaceprefs.h
diff --git
a/cinelerra-5.1/cinelerra/interfaceprefs.h
b/cinelerra-5.1/cinelerra/interfaceprefs.h
index 12d43a312eec0ffac6fd4f22576d6274b7c3fc6b..d4efc81f6ab5105d36b3b4b30976de599467e516 100644
(file)
--- a/
cinelerra-5.1/cinelerra/interfaceprefs.h
+++ b/
cinelerra-5.1/cinelerra/interfaceprefs.h
@@
-173,7
+173,8
@@
public:
InterfacePrefs *iface_prefs;
int handle_event();
InterfacePrefs *iface_prefs;
int handle_event();
- ShBtnPrefs(PreferencesWindow *pwindow, InterfacePrefs *iface_prefs, int x, int y);
+ ShBtnPrefs(PreferencesWindow *pwindow,
+ InterfacePrefs *iface_prefs, int x, int y);
};
class StillImageUseDuration : public BC_CheckBox
{
};
class StillImageUseDuration : public BC_CheckBox
{
@@
-194,11
+195,15
@@
public:
class KeyframeReticle : public BC_PopupMenu
{
public:
class KeyframeReticle : public BC_PopupMenu
{
public:
- KeyframeReticle(int x, int y, int *output);
+ KeyframeReticle(PreferencesWindow *pwindow,
+ InterfacePrefs *iface_prefs, int x, int y, int *output);
~KeyframeReticle();
~KeyframeReticle();
- const char
*
hairline_to_string(int type);
+ const char
*
hairline_to_string(int type);
void create_objects();
void create_objects();
+
+ PreferencesWindow *pwindow;
+ InterfacePrefs *iface_prefs;
int *output;
};
int *output;
};