X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferencesthread.C;h=1de73c3b092d549e96d7f5ca9a2b9af215b8fb7f;hb=95683646dce10ad3f6a8c8c9c9225c69f4841ec5;hp=26c92c56e6bb37a0dc7cfb6df238a1f21554bfb1;hpb=93d60cc0fdf746cc03b4d7a9e45744c2c424439b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index 26c92c56..1de73c3b 100644
--- 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 ?
-		_("Try FFMpeg first") : _("Try FFMpeg last") );
+	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 ?
+		FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP);
 	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);