X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferences.C;h=dbf14c49597688b74f7028d96815eca5948d527d;hb=099132c524d32342be6cfc4948ecb1b3a439b988;hp=a3ebc48f576b14f786b2c402daf697b9ff4a1769;hpb=8cad02a7b02e4a8543bc5514892b51aed877a193;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index a3ebc48f..dbf14c49 100644
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -65,18 +65,21 @@ Preferences::Preferences()
 	keyframe_reticle = HAIRLINE_DRAGGING;
 	perpetual_session = 0;
 	strcpy(lv2_path, DEFAULT_LV2_PATH);
+	strcpy(nested_proxy_path, DEFAULT_NESTED_PROXY_PATH);
 	autostart_lv2ui = 0;
 	trap_sigsegv = 1;
 	trap_sigintr = 1;
 	awindow_picon_h = 50;
+	layout_scale = 0; // auto scale
 	vicon_size = 50;
 	vicon_color_mode = VICON_COLOR_MODE_LOW;
 	theme[0] = 0;
 	plugin_icons[0] = 0;
-	strcpy(snapshot_path, "/tmp");
+	strcpy(snapshot_path, DEFAULT_SNAPSHOT_PATH);
 	use_renderfarm = 0;
 	force_uniprocessor = 0;
 	renderfarm_port = DEAMON_PORT;
+	renderfarm_consolidate = 0;
 	render_preroll = 0.5;
 	brender_preroll = 0;
 	renderfarm_mountpoint[0] = 0;
@@ -89,6 +92,8 @@ Preferences::Preferences()
 	memset(&use_hw_dev, 0, sizeof(use_hw_dev));
 	warn_indexes = 1;
 	warn_version = 1;
+	warn_stack = 1;
+	warn_fileref = 1;
 	bd_warn_root = 1;
 	popupmenu_btnup = 1;
 	grab_input_focus = 1;
@@ -180,6 +185,7 @@ void Preferences::copy_from(Preferences *that)
 	keyframe_reticle = that->keyframe_reticle;
 	perpetual_session = that->perpetual_session;
 	awindow_picon_h = that->awindow_picon_h;
+	layout_scale = that->layout_scale;
 	vicon_size = that->vicon_size;
 	vicon_color_mode = that->vicon_color_mode;
 	strcpy(theme, that->theme);
@@ -202,6 +208,7 @@ void Preferences::copy_from(Preferences *that)
 	force_uniprocessor = that->force_uniprocessor;
 	strcpy(lv2_path, that->lv2_path);
 	autostart_lv2ui = that->autostart_lv2ui;
+	strcpy(nested_proxy_path, that->nested_proxy_path);
 	trap_sigsegv = that->trap_sigsegv;
 	trap_sigintr = that->trap_sigintr;
 	processors = that->processors;
@@ -210,6 +217,8 @@ void Preferences::copy_from(Preferences *that)
 	strcpy(use_hw_dev, &that->use_hw_dev[0]);
 	warn_indexes = that->warn_indexes;
 	warn_version = that->warn_version;
+	warn_stack = that->warn_stack;
+	warn_fileref = that->warn_fileref;
 	bd_warn_root = that->bd_warn_root;
 	popupmenu_btnup = that->popupmenu_btnup;
 	grab_input_focus = that->grab_input_focus;
@@ -325,17 +334,20 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	strcpy(lv2_path, DEFAULT_LV2_PATH);
 	defaults->get("LV2_PATH", lv2_path);
 	autostart_lv2ui = defaults->get("AUTOSTART_LV2UI", autostart_lv2ui);
+	strcpy(nested_proxy_path, DEFAULT_NESTED_PROXY_PATH);
+	defaults->get("NESTED_PROXY_PATH", nested_proxy_path);
 	trap_sigsegv = defaults->get("TRAP_SIGSEGV", trap_sigsegv);
 	trap_sigintr = defaults->get("TRAP_SIGINTR", trap_sigintr);
 
 	awindow_picon_h = defaults->get("AWINDOW_PICON_H", awindow_picon_h);
+	layout_scale = defaults->get("LAYOUT_SCALE",layout_scale);
 	vicon_size = defaults->get("VICON_SIZE",vicon_size);
 	vicon_color_mode = defaults->get("VICON_COLOR_MODE",vicon_color_mode);
 	strcpy(theme, _(DEFAULT_THEME));
 	strcpy(plugin_icons, DEFAULT_PICON);
 	defaults->get("THEME", theme);
 	defaults->get("PLUGIN_ICONS", plugin_icons);
-	strcpy(snapshot_path, "/tmp");
+	strcpy(snapshot_path, DEFAULT_SNAPSHOT_PATH);
 	defaults->get("SNAPSHOT_PATH", snapshot_path);
 
 	for( int i=0; i<MAXCHANNELS; ++i ) {
@@ -354,6 +366,8 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	defaults->get("USE_HW_DEV", use_hw_dev);
 	warn_indexes = defaults->get("WARN_INDEXES", warn_indexes);
 	warn_version = defaults->get("WARN_VERSION", warn_version);
+	warn_stack = defaults->get("WARN_STACK", warn_stack);
+	warn_fileref = defaults->get("WARN_FILEREF", warn_fileref);
 	bd_warn_root = defaults->get("BD_WARN_ROOT", bd_warn_root);
 	popupmenu_btnup = defaults->get("POPUPMENU_BTNUP", popupmenu_btnup);
 	grab_input_focus = defaults->get("GRAB_FOCUS", grab_input_focus);
@@ -408,7 +422,7 @@ 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(_("Current Manual"), "$CIN_BROWSER https://cinelerra-gg.org/download/CinelerraGG_manual.pdf"));
+		shbtn_prefs.append(new ShBtnPref(_("Current Manual"), "$CIN_BROWSER https://cinelerra-gg.org/download/CinelerraGG_Manual.pdf"));
 		shbtn_prefs.append(new ShBtnPref(_("Setting Shell Commands"), "$CIN_BROWSER file://$CIN_DAT/doc/ShellCmds.html"));
 		shbtn_prefs.append(new ShBtnPref(_("Shortcuts"), "$CIN_BROWSER file://$CIN_DAT/doc/shortcuts.html"));
 		shbtn_prefs.append(new ShBtnPref(_("RenderMux"), "$CIN_DAT/doc/RenderMux.sh"));
@@ -475,9 +489,11 @@ int Preferences::save_defaults(BC_Hash *defaults)
 	defaults->update("PERPETUAL_SESSION", perpetual_session);
 	defaults->update("LV2_PATH", lv2_path);
 	defaults->update("AUTOSTART_LV2UI", autostart_lv2ui);
+	defaults->update("NESTED_PROXY_PATH", nested_proxy_path);
 	defaults->update("TRAP_SIGSEGV", trap_sigsegv);
 	defaults->update("TRAP_SIGINTR", trap_sigintr);
 	defaults->update("AWINDOW_PICON_H", awindow_picon_h);
+	defaults->update("LAYOUT_SCALE",layout_scale);
 	defaults->update("VICON_SIZE",vicon_size);
 	defaults->update("VICON_COLOR_MODE",vicon_color_mode);
 	defaults->update("THEME", theme);
@@ -497,6 +513,8 @@ int Preferences::save_defaults(BC_Hash *defaults)
 	defaults->update("USE_HW_DEV", use_hw_dev);
 	defaults->update("WARN_INDEXES", warn_indexes);
 	defaults->update("WARN_VERSION", warn_version);
+	defaults->update("WARN_STACK", warn_stack);
+	defaults->update("WARN_FILEREF", warn_fileref);
 	defaults->update("BD_WARN_ROOT", bd_warn_root);
 	defaults->update("POPUPMENU_BTNUP", popupmenu_btnup);
 	defaults->update("GRAB_FOCUS", grab_input_focus);