update ru.po per andrew, fix bg pixmaps tweak, confirm pref update segv, scaling...

[goodguy/cinelerra.git] / cinelerra-5.1 / plugins / yuv411 / yuv411.C

diff --git a/cinelerra-5.1/plugins/yuv411/yuv411.C b/cinelerra-5.1/plugins/yuv411/yuv411.C
index c014ec75f0ff463a15cbc1725460d8926d719066..57a14ba198aa9357fbbca044d95f96f951c38fee 100644 (file)
--- a/cinelerra-5.1/plugins/yuv411/yuv411.C
+++ b/cinelerra-5.1/plugins/yuv411/yuv411.C
@@ -161,7 +161,7 @@ int yuv411Main::process_realtime(VFrame *input_ptr, VFrame *output_ptr)
        load_configuration();
        int w = input_ptr->get_w();
        int h = input_ptr->get_h();
-       int colormodel = input_ptr->get_color_model();
+       colormodel = input_ptr->get_color_model();
 
        if( input_ptr == output_ptr ||
            ( config.avg_vertical && config.int_horizontal ) ) {
@@ -187,11 +187,7 @@ int yuv411Main::process_realtime(VFrame *input_ptr, VFrame *output_ptr)
                break;
        }
 
-       if( this->colormodel != colormodel ) {
-               this->colormodel = colormodel;
-               send_render_gui(this);
-       }
-
+       send_render_gui(this);
        return 0;
 }
 
@@ -221,19 +217,23 @@ void yuv411Main::update_gui()
 void yuv411Main::render_gui(void *data)
 {
        if(thread) {
-               thread->window->lock_window();
                yuv411Window *window = (yuv411Window *)thread->window;
                yuv411Main *client = (yuv411Main *)data;
-               switch( client->colormodel ) {
-               case BC_YUV888:
-               case BC_YUVA8888:
-                       window->show_warning(0);
-                       break;
-               default:
-                       window->show_warning(1);
-                       break;
+               if( window->colormodel != client->colormodel ) {
+                       int warn = 1;
+                       switch( client->colormodel ) {
+                       case BC_YUV888:
+                       case BC_YUVA8888:
+                               warn = 0;
+                               break;
+                       }
+                       if( warn == window->yuv_warning->is_hidden() ) {
+                               window->lock_window("yuv411Main::render_gui");
+                               window->show_warning(warn);
+                               window->colormodel = client->colormodel;
+                               window->unlock_window();
+                       }
                }
-               window->unlock_window();
        }
 }