projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
gwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/gwindowgui.C
b/cinelerra-5.1/cinelerra/gwindowgui.C
index d01268618d80f17887547e1f04ad357d3a0f59b9..97a9adc2da970616ef6d263430214ae992df6879 100644
(file)
--- a/
cinelerra-5.1/cinelerra/gwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/gwindowgui.C
@@
-71,7
+71,7
@@
const char *GWindowGUI::other_text[NON_AUTOMATION_TOTAL] =
N_("Assets"),
N_("Titles"),
N_("Transitions"),
N_("Assets"),
N_("Titles"),
N_("Transitions"),
- N_("Plugin
Auto
s")
+ N_("Plugin
Keyframe
s")
};
const char *GWindowGUI::auto_text[AUTOMATION_TOTAL] =
};
const char *GWindowGUI::auto_text[AUTOMATION_TOTAL] =
@@
-190,8
+190,10
@@
GWindowColorButton::GWindowColorButton(GWindowToggle *auto_toggle, int x, int y,
{
this->auto_toggle = auto_toggle;
this->color = 0;
{
this->auto_toggle = auto_toggle;
this->color = 0;
- for( int i=0; i<3; ++i )
- vframes[i] = new VFrame(w, w, BC_RGBA8888, -1);
+ for( int i=0; i<3; ++i ) {
+ vframes[i] = new VFrame(w, w, BC_RGBA8888);
+ vframes[i]->clear_frame();
+ }
}
GWindowColorButton::~GWindowColorButton()
}
GWindowColorButton::~GWindowColorButton()
@@
-351,7
+353,7
@@
int GWindowColorButton::handle_event()
void GWindowGUI::create_objects()
{
int x = 10, y = 10;
void GWindowGUI::create_objects()
{
int x = 10, y = 10;
- lock_window("GWindowGUI::create_objects
1
");
+ lock_window("GWindowGUI::create_objects");
for( int i=0; i<(int)(sizeof(toggle_order)/sizeof(toggle_order[0])); ++i ) {
toggleinfo *tp = &toggle_order[i];
for( int i=0; i<(int)(sizeof(toggle_order)/sizeof(toggle_order[0])); ++i ) {
toggleinfo *tp = &toggle_order[i];