GLx4 w/h mult of 4 is not req, cwdw crop input range checks, fix cropp.png dir, chang...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / preferencesthread.C

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index 6c4707dda15000939dc8ebcfb22db1d43c84db7b..73d8d5d4e4ab06b717729af0bee3911d5d9c5334 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -174,10 +174,10 @@ int PreferencesThread::update_framerate()
 {
        if(thread_running)
        {
-               lock_gui("PreferencesThread::update_framerate");
+               lock_dialog("PreferencesThread::update_framerate");
                PreferencesWindow *window = (PreferencesWindow*)get_gui();
                if(window) window->update_framerate();
-               unlock_gui();
+               unlock_dialog();
        }
        return 0;
 }
@@ -187,10 +187,10 @@ void PreferencesThread::update_rates()
 {
        if(thread_running)
        {
-               lock_gui("PreferencesThread::update_framerate");
+               lock_dialog("PreferencesThread::update_framerate");
                PreferencesWindow *window = (PreferencesWindow*)get_gui();
                if(window) window->update_rates();
-               unlock_gui();
+               unlock_dialog();
        }
 }
 
@@ -273,7 +273,7 @@ int PreferencesThread::apply_settings()
 
 //edl->session->recording_format->dump();
 //mwindow->edl->session->recording_format->dump();
-
+#ifdef GLx4
        if(((mwindow->edl->session->output_w % 4) ||
                (mwindow->edl->session->output_h % 4)) &&
                mwindow->edl->session->playback_config->vconfig->driver == PLAYBACK_X11_GL)
@@ -282,7 +282,7 @@ int PreferencesThread::apply_settings()
                        _("This project's dimensions are not multiples of 4 so\n"
                        "it can't be rendered by OpenGL."));
        }
-
+#endif
 
        if(redraw_meters)
        {