18 new shapewipe transitions from rafa, rework savefile/confirm for nested edl edits

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / preferences.C

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index 30a99ca3fb46f704f690a14041b8b00924263efd..dbf14c49597688b74f7028d96815eca5948d527d 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -65,6 +65,7 @@ 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;
@@ -74,7 +75,7 @@ Preferences::Preferences()
        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;
@@ -92,6 +93,7 @@ Preferences::Preferences()
        warn_indexes = 1;
        warn_version = 1;
        warn_stack = 1;
+       warn_fileref = 1;
        bd_warn_root = 1;
        popupmenu_btnup = 1;
        grab_input_focus = 1;
@@ -206,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;
@@ -215,6 +218,7 @@ void Preferences::copy_from(Preferences *that)
        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;
@@ -330,6 +334,8 @@ 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);
 
@@ -341,7 +347,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
        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 ) {
@@ -361,6 +367,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
        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);
@@ -415,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"));
@@ -482,6 +489,7 @@ 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);
@@ -506,6 +514,7 @@ int Preferences::save_defaults(BC_Hash *defaults)
        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);