X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferences.C;h=6c20a53a7a071d9135c746e7e70b804019a484c1;hb=9f917bc27389ebc36568a1f465b42208f7e8e46a;hp=cee80362c68536ebcad141b2c0cf37e937efd907;hpb=7a70932d3e04454177c456d0b42ee2f5318d6ad1;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index cee80362..6c20a53a 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;
@@ -82,6 +80,7 @@ Preferences::Preferences()
 	ffmpeg_early_probe = 0;
 	ffmpeg_marker_indexes = 1;
 	warn_indexes = 1;
+	dvd_yuv420p_interlace = 0;
 
 // Default brender asset
 	brender_asset = new Asset;
@@ -186,6 +185,7 @@ 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;
+	dvd_yuv420p_interlace = that->dvd_yuv420p_interlace;
 	renderfarm_nodes.remove_all_objects();
 	renderfarm_ports.remove_all();
 	renderfarm_enabled.remove_all();
@@ -332,6 +332,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	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);
+	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,9 +376,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("Features5", "firefox file:///$CINELERRA_PATH/doc/Features5.pdf", 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:///$CINELERRA_PATH/doc/cinelerra.html", 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 ) {
@@ -432,6 +433,7 @@ int Preferences::save_defaults(BC_Hash *defaults)
 	defaults->update("FFMPEG_EARLY_PROBE", ffmpeg_early_probe);
 	defaults->update("FFMPEG_MARKER_INDEXES", ffmpeg_marker_indexes);
 	defaults->update("WARN_INDEXES", warn_indexes);
+	defaults->update("DVD_YUV420P_INTERLACE", dvd_yuv420p_interlace);
 	brender_asset->save_defaults(defaults,
 		"BRENDER_",
 		1,
@@ -704,7 +706,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");