X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferences.C;h=c9153a95b21917bb503eb17de49cdffa8001fd65;hp=f4ccda6a47d6d60a02831ca62a111165c0602dc6;hb=b78b166faf60a1c7357f990b1e2fb0e70be29fee;hpb=3305343c3d9bfb889f6892e7821cc0e2d68669de

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index f4ccda6a..c9153a95 100644
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -69,6 +69,7 @@ Preferences::Preferences()
 	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;
@@ -100,6 +101,7 @@ Preferences::Preferences()
 	yuv_color_range = BC_COLORS_JPEG;
 	autocolor_assets = 0;
 	ctrl_toggle = 0;
+	rectify_audio = 0;
 
 // Default brender asset
 	brender_asset = new Asset;
@@ -179,6 +181,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);
@@ -220,6 +223,7 @@ void Preferences::copy_from(Preferences *that)
 	yuv_color_range = that->yuv_color_range;
 	autocolor_assets = that->autocolor_assets;
 	ctrl_toggle = that->ctrl_toggle;
+	rectify_audio = that->rectify_audio;
 	renderfarm_nodes.remove_all_objects();
 	renderfarm_ports.remove_all();
 	renderfarm_enabled.remove_all();
@@ -327,6 +331,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	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));
@@ -363,6 +368,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
 	yuv_color_range = defaults->get("YUV_COLOR_RANGE", yuv_color_range);
 	autocolor_assets = defaults->get("AUTOCOLOR_ASSETS", autocolor_assets);
 	ctrl_toggle = defaults->get("CTRL_TOGGLE", ctrl_toggle);
+	rectify_audio = defaults->get("RECTIFY_AUDIO", rectify_audio);
 	use_brender = defaults->get("USE_BRENDER", use_brender);
 	brender_fragment = defaults->get("BRENDER_FRAGMENT", brender_fragment);
 	cache_size = defaults->get("CACHE_SIZE", cache_size);
@@ -405,10 +411,10 @@ 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", 0));
-		shbtn_prefs.append(new ShBtnPref(_("Setting Shell Commands"), "$CIN_BROWSER file://$CIN_DAT/doc/ShellCmds.html", 0));
-		shbtn_prefs.append(new ShBtnPref(_("Shortcuts"), "$CIN_BROWSER file://$CIN_DAT/doc/shortcuts.html", 0));
-		shbtn_prefs.append(new ShBtnPref(_("RenderMux"), "$CIN_DAT/doc/RenderMux.sh",0));
+		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"));
 		shbtns_total = 0;
 	}
 	for( int i=0; i<shbtns_total; ++i ) {
@@ -419,7 +425,9 @@ int Preferences::load_defaults(BC_Hash *defaults)
 		defaults->get(string, commands);
 		sprintf(string, "SHBTN%d_WARN", i);
 		int warn = defaults->get(string, 0);
-		shbtn_prefs.append(new ShBtnPref(name, commands, warn));
+		sprintf(string, "SHBTN%d_RUN_SCRIPT", i);
+		int run_script = defaults->get(string, 0);
+		shbtn_prefs.append(new ShBtnPref(name, commands, warn, run_script));
 	}
 
 	file_probes.remove_all_objects();
@@ -473,6 +481,7 @@ int Preferences::save_defaults(BC_Hash *defaults)
 	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);
@@ -503,6 +512,7 @@ int Preferences::save_defaults(BC_Hash *defaults)
 	defaults->update("YUV_COLOR_RANGE", yuv_color_range);
 	defaults->update("AUTOCOLOR_ASSETS", autocolor_assets);
 	defaults->update("CTRL_TOGGLE", ctrl_toggle);
+	defaults->update("RECTIFY_AUDIO", rectify_audio);
 	brender_asset->save_defaults(defaults, "BRENDER_", 1, 1, 1, 0, 0);
 	defaults->update("USE_BRENDER", use_brender);
 	defaults->update("BRENDER_FRAGMENT", brender_fragment);
@@ -536,6 +546,8 @@ int Preferences::save_defaults(BC_Hash *defaults)
 		defaults->update(string, pref->commands);
 		sprintf(string, "SHBTN%d_WARN", i);
 		defaults->update(string, pref->warn);
+		sprintf(string, "SHBTN%d_RUN_SCRIPT", i);
+		defaults->update(string, pref->run_script);
 	}
 	defaults->update("FILE_PROBE_TOTAL", file_probes.size());
 	for( int i=0; i<file_probes.size(); ++i ) {