X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferences.C;h=4b7a92aecf98b50de38953df03e80fb34c585fd3;hb=d85ee0843fbbd79a0a7d2ffa0aac57968e24f6d7;hp=89bf4424cbf11e4d3385a18bace9c77a2337ff2b;hpb=6616b3b82fdbc586f5da00bf772e45d8ada3b464;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index 89bf4424..4b7a92ae 100644
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -27,7 +27,7 @@
 #include "cache.inc"
 #include "clip.h"
 #include "bchash.h"
-#include "file.inc"
+#include "file.h"
 #include "filesystem.h"
 #include "guicast.h"
 #include "indexfile.h"
@@ -54,11 +54,9 @@ Preferences::Preferences()
 	preferences_lock = new Mutex("Preferences::preferences_lock");
 
 
-
-	get_exe_path(plugin_dir);
-	strcat(plugin_dir,"/plugins");
-
-	sprintf(index_directory, BCASTDIR);
+// initial plugin path from build -DPLUGIN_DIR="..."
+	sprintf(plugin_dir, "%s/", File::get_plugin_path());
+	sprintf(index_directory, "%s/", File::get_config_path());
 	if(strlen(index_directory))
 		fs.complete_path(index_directory);
 	cache_size = 0x1000000;
@@ -77,11 +75,16 @@ 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 = 0;
+	dvd_yuv420p_interlace = 0;
 
 // Default brender asset
 	brender_asset = new Asset;
@@ -178,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;
@@ -186,6 +190,11 @@ void Preferences::copy_from(Preferences *that)
 	ffmpeg_early_probe = that->ffmpeg_early_probe;
 	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();
 	renderfarm_enabled.remove_all();
@@ -328,10 +337,16 @@ 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);
 	cache_size = defaults->get("CACHE_SIZE", cache_size);
@@ -375,8 +390,9 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	shbtn_prefs.remove_all_objects();
 	int shbtns_total = defaults->get("SHBTNS_TOTAL", -1);
 	if( shbtns_total < 0 ) {
-//		shbtn_prefs.append(new ShBtnPref("manual", "firefox file:///$CINELERRA_PATH/manual.pdf", 0));
-		shbtn_prefs.append(new ShBtnPref("online help", "firefox https://cinelerra-cv.org/docs/cinelerra_cv_manual_en.html", 0));
+		shbtn_prefs.append(new ShBtnPref("Features5", "firefox file://$CIN_DAT/doc/Features5.pdf", 0));
+		shbtn_prefs.append(new ShBtnPref("Online Help", "firefox https://cinelerra-cv.org/docs.php", 0));
+		shbtn_prefs.append(new ShBtnPref("Orignal Manual", "firefox file://$CIN_DAT/doc/cinelerra.html", 0));
 		shbtns_total = 0;
 	}
 	for( int i=0; i<shbtns_total; ++i ) {
@@ -427,17 +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);
-	brender_asset->save_defaults(defaults,
-		"BRENDER_",
-		1,
-		1,
-		1,
-		0,
-		0);
+	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);
 	defaults->update("USE_BRENDER", use_brender);
 	defaults->update("BRENDER_FRAGMENT", brender_fragment);
 	defaults->update("USE_RENDERFARM", use_renderfarm);
@@ -703,7 +719,8 @@ 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_VMPEG || asset->format == FILE_AMPEG ) ) {
 		char source_filename[BCTEXTLEN], index_filename[BCTEXTLEN];
 		IndexFile::get_index_filename(source_filename,
 			index_directory, index_filename, asset->path, ".toc");