X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferences.C;h=950ddfc26eebcd398e84b2efa38775824ac07389;hp=5922414cc3bc8fa7a959cb7053173e4d3a49b196;hb=ef8f59c95a8966d70e5c2ecb89f0f22ea82e1e28;hpb=6fd57106820e676e368399d16b925bdc78d34621

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index 5922414c..950ddfc2 100644
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -75,13 +75,15 @@ Preferences::Preferences()
 	renderfarm_mountpoint[0] = 0;
 	renderfarm_vfs = 0;
 	renderfarm_job_count = 20;
-	processors = calculate_processors(0);
+	project_smp = processors = calculate_processors(0);
 	real_processors = calculate_processors(1);
 	ffmpeg_early_probe = 0;
 	ffmpeg_marker_indexes = 1;
 	warn_indexes = 1;
 	warn_version = 1;
+	bd_warn_root = 1;
 	popupmenu_btnup = 1;
+	textbox_focus_policy = LEAVE_DEACTIVATE;
 	dvd_yuv420p_interlace = 0;
 
 // Default brender asset
@@ -179,6 +181,7 @@ void Preferences::copy_from(Preferences *that)
 	for( int i=0; i<that->shbtn_prefs.size(); ++i )
 		this->shbtn_prefs.append(new ShBtnPref(*that->shbtn_prefs[i]));
 	cache_size = that->cache_size;
+	project_smp = that->project_smp;
 	force_uniprocessor = that->force_uniprocessor;
 	trap_sigsegv = that->trap_sigsegv;
 	trap_sigintr = that->trap_sigintr;
@@ -188,7 +191,9 @@ void Preferences::copy_from(Preferences *that)
 	ffmpeg_marker_indexes = that->ffmpeg_marker_indexes;
 	warn_indexes = that->warn_indexes;
 	warn_version = that->warn_version;
+	bd_warn_root = that->bd_warn_root;
 	popupmenu_btnup = that->popupmenu_btnup;
+	textbox_focus_policy = that->textbox_focus_policy;
 	dvd_yuv420p_interlace = that->dvd_yuv420p_interlace;
 	renderfarm_nodes.remove_all_objects();
 	renderfarm_ports.remove_all();
@@ -332,12 +337,15 @@ int Preferences::load_defaults(BC_Hash *defaults)
 
 
 
+	project_smp = defaults->get("PROJECT_SMP", project_smp);
 	force_uniprocessor = defaults->get("FORCE_UNIPROCESSOR", force_uniprocessor);
 	ffmpeg_early_probe = defaults->get("FFMPEG_EARLY_PROBE", ffmpeg_early_probe);
 	ffmpeg_marker_indexes = defaults->get("FFMPEG_MARKER_INDEXES", ffmpeg_marker_indexes);
 	warn_indexes = defaults->get("WARN_INDEXES", warn_indexes);
 	warn_version = defaults->get("WARN_VERSION", warn_version);
+	bd_warn_root = defaults->get("BD_WARN_ROOT", bd_warn_root);
 	popupmenu_btnup = defaults->get("POPUPMENU_BTNUP", popupmenu_btnup);
+	textbox_focus_policy = defaults->get("TEXTBOX_FOCUS_POLICY", textbox_focus_policy);
 	dvd_yuv420p_interlace = defaults->get("DVD_YUV420P_INTERLACE", dvd_yuv420p_interlace);
 	use_brender = defaults->get("USE_BRENDER", use_brender);
 	brender_fragment = defaults->get("BRENDER_FRAGMENT", brender_fragment);
@@ -435,20 +443,17 @@ int Preferences::save_defaults(BC_Hash *defaults)
 		defaults->update(string, string2);
 	}
 
+	defaults->update("PROJECT_SMP", project_smp);
 	defaults->update("FORCE_UNIPROCESSOR", force_uniprocessor);
 	defaults->update("FFMPEG_EARLY_PROBE", ffmpeg_early_probe);
 	defaults->update("FFMPEG_MARKER_INDEXES", ffmpeg_marker_indexes);
 	defaults->update("WARN_INDEXES", warn_indexes);
 	defaults->update("WARN_VERSION", warn_version);
+	defaults->update("BD_WARN_ROOT", bd_warn_root);
 	defaults->update("POPUPMENU_BTNUP", popupmenu_btnup);
+	defaults->update("TEXTBOX_FOCUS_POLICY", textbox_focus_policy);
 	defaults->update("DVD_YUV420P_INTERLACE", dvd_yuv420p_interlace);
-	brender_asset->save_defaults(defaults,
-		"BRENDER_",
-		1,
-		1,
-		1,
-		0,
-		0);
+	brender_asset->save_defaults(defaults, "BRENDER_", 1, 1, 1, 0, 0);
 	defaults->update("USE_BRENDER", use_brender);
 	defaults->update("BRENDER_FRAGMENT", brender_fragment);
 	defaults->update("USE_RENDERFARM", use_renderfarm);