awindowgui / mwindowedit / label rework

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

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index d02f9ad44304704bfd90990a42367a9295ede31c..9393d4359f7158802ffe3c9eab8f84096863e4a0 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -23,6 +23,7 @@
 #include "asset.h"
 #include "audiodevice.inc"
 #include "bcsignals.h"
+#include "bctrace.h"
 #include "cache.h"
 #include "cplayback.h"
 #include "cwindow.h"
@@ -62,7 +63,7 @@
 
 
 #define WIDTH 770
-#define HEIGHT 690
+#define HEIGHT 720
 
 
 PreferencesMenuitem::PreferencesMenuitem(MWindow *mwindow)
@@ -207,7 +208,7 @@ int PreferencesThread::apply_settings()
                (preferences->force_uniprocessor != mwindow->preferences->force_uniprocessor) ||
                this_playback_config->active_config != playback_config->active_config ||
                (*this_aconfig != *aconfig) || (*this_vconfig != *vconfig) ||
-               !preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1);
+               !preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1, edl);
 
        if( strcmp(preferences->theme, mwindow->preferences->theme) != 0 )
                mwindow->restart_status = -1; // reload, need new bcresources
@@ -219,13 +220,21 @@ int PreferencesThread::apply_settings()
        BC_Signals::set_catch_segv(mwindow->preferences->trap_sigsegv);
        BC_Signals::set_catch_intr(mwindow->preferences->trap_sigintr);
        BC_WindowBase::get_resources()->popupmenu_btnup = mwindow->preferences->popupmenu_btnup;
+       BC_WindowBase::get_resources()->textbox_focus_policy = mwindow->preferences->textbox_focus_policy;
+       if( mwindow->preferences->trap_sigsegv || mwindow->preferences->trap_sigintr ) {
+               BC_Trace::enable_locks();
+       }
+       else {
+               BC_Trace::disable_locks();
+       }
 
        mwindow->reset_android_remote();
-       mwindow->gui->ffmpeg_toggle->update(mwindow->preferences->ffmpeg_early_probe);
-       mwindow->gui->ffmpeg_toggle->set_tooltip( mwindow->preferences->ffmpeg_early_probe ?
+       int ffmpeg_early_probe = mwindow->preferences->get_file_probe_armed("FFPMEG_Early");
+       mwindow->gui->ffmpeg_toggle->update(ffmpeg_early_probe);
+       mwindow->gui->ffmpeg_toggle->set_tooltip(ffmpeg_early_probe ?
                _("Try FFMpeg first") : _("Try FFMpeg last") );
        mwindow->gui->mainshbtns->load(mwindow->preferences);
-       double tc_position = 
+       double tc_position =
                mwindow->edl->session->get_frame_offset() / mwindow->edl->session->frame_rate;
        mwindow->gui->mainclock->set_position_offset(tc_position);
 
@@ -365,7 +374,7 @@ SET_TRACE
 
 PreferencesWindow::PreferencesWindow(MWindow *mwindow,
        PreferencesThread *thread, int x, int y, int w, int h)
- : BC_Window(_(PROGRAM_NAME ": Preferences"), x,y, w,h, 1,0,1)
+ : BC_Window(_(PROGRAM_NAME ": Preferences"), x,y, w,h,w,h, 1)
 {
        this->mwindow = mwindow;
        this->thread = thread;