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 5cf353caff3068013edd24f29bd6f36accfa3775..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_("Plugin Autos")
+       N_("Plugin Keyframes")
 };
 
 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;
-       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()
@@ -248,7 +250,7 @@ void GWindowColorButton::update_gui(int color)
 }
 
 GWindowColorThread::GWindowColorThread(GWindowColorButton *color_button)
- : ColorThread(0, color_button->auto_toggle->caption)
+ : ColorPicker(0, color_button->auto_toggle->caption)
 {
        this->color = 0;
        this->color_button = color_button;
@@ -351,7 +353,7 @@ int GWindowColorButton::handle_event()
 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];
@@ -415,6 +417,7 @@ int GWindowGUI::translation_event()
 
 int GWindowGUI::close_event()
 {
+       delete color_thread;  color_thread = 0;
        hide_window();
        mwindow->session->show_gwindow = 0;
        unlock_window();