projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add lv2 autostart pref, add ffmpeg config pot/slider
[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 5cf353caff3068013edd24f29bd6f36accfa3775..d7f639ed35634282db8e33dddaf203437ceed653 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()
@@
-248,7
+250,7
@@
void GWindowColorButton::update_gui(int color)
}
GWindowColorThread::GWindowColorThread(GWindowColorButton *color_button)
}
GWindowColorThread::GWindowColorThread(GWindowColorButton *color_button)
- : Color
Thread
(0, color_button->auto_toggle->caption)
+ : Color
Picker
(0, color_button->auto_toggle->caption)
{
this->color = 0;
this->color_button = color_button;
{
this->color = 0;
this->color_button = color_button;
@@
-415,6
+417,7
@@
int GWindowGUI::translation_event()
int GWindowGUI::close_event()
{
int GWindowGUI::close_event()
{
+ delete color_thread; color_thread = 0;
hide_window();
mwindow->session->show_gwindow = 0;
unlock_window();
hide_window();
mwindow->session->show_gwindow = 0;
unlock_window();