X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferences.C;h=dbf14c49597688b74f7028d96815eca5948d527d;hp=75768b65ea42e4afe925b7548a81891d2ac1e692;hb=9b18af02dc4ccbf052ef9d70180a3d16c0f9848b;hpb=97552ff95c1bf20be9192b8101f61de5490eff20 diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C index 75768b65..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; @@ -100,6 +105,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 +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); @@ -201,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; @@ -209,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; @@ -220,6 +230,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(); @@ -323,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; iget("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); @@ -363,6 +379,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,12 +422,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(_("Features"), "$CIN_BROWSER file://$CIN_DAT/doc/Features5.pdf", 0)); - shbtn_prefs.append(new ShBtnPref(_("Online Help"), "$CIN_BROWSER https://cinelerra-cv.org/docs.php", 0)); - shbtn_prefs.append(new ShBtnPref(_("Original Manual"), "$CIN_BROWSER file://$CIN_DAT/doc/cinelerra.html", 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; iget(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(); @@ -472,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); @@ -494,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); @@ -505,6 +526,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); @@ -538,6 +560,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