X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferences.C;h=f69ab3e847898b9e5520b194df0174b0fb0b529c;hb=d1bc42c0643e30b93e058dfd01b4329f1b75149f;hp=97efba935a3eb743fa7ab846307226e187db8d9b;hpb=14c59195960203265f308a703e834e7c5f59f6d2;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index 97efba93..f69ab3e8 100644
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -77,12 +77,13 @@ Preferences::Preferences()
 	renderfarm_job_count = 20;
 	project_smp = processors = calculate_processors(0);
 	real_processors = calculate_processors(1);
-	ffmpeg_early_probe = 0;
+	ffmpeg_early_probe = 1;
 	ffmpeg_marker_indexes = 1;
 	warn_indexes = 1;
 	warn_version = 1;
 	bd_warn_root = 1;
 	popupmenu_btnup = 1;
+	textbox_focus_policy = 0;
 	dvd_yuv420p_interlace = 0;
 
 // Default brender asset
@@ -192,6 +193,7 @@ void Preferences::copy_from(Preferences *that)
 	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();
@@ -343,6 +345,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	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);
@@ -448,14 +451,9 @@ int Preferences::save_defaults(BC_Hash *defaults)
 	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);
@@ -721,7 +719,7 @@ int Preferences::get_asset_file_path(Asset *asset, char *path)
 {
 	strcpy(path, asset->path);
 	int result = !access(path, R_OK) ? 0 : -1;
-	if( !result && ( asset->format == FILE_MPEG ||
+	if( !result && ( asset->format == FILE_MPEG || asset->format == FILE_AC3 ||
 		asset->format == FILE_VMPEG || asset->format == FILE_AMPEG ) ) {
 		char source_filename[BCTEXTLEN], index_filename[BCTEXTLEN];
 		IndexFile::get_index_filename(source_filename,