add nested proxy path, rework perpetual session load/save strategy, build cleanups

[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 c9153a95b21917bb503eb17de49cdffa8001fd65..ba69bd48cb2245bc461976b84764440e7e4605fb 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;
@@ -78,6 +79,7 @@ Preferences::Preferences()
        use_renderfarm = 0;
        force_uniprocessor = 0;
        renderfarm_port = DEAMON_PORT;
+       renderfarm_consolidate = 0;
        render_preroll = 0.5;
        brender_preroll = 0;
        renderfarm_mountpoint[0] = 0;
@@ -90,6 +92,7 @@ Preferences::Preferences()
        memset(&use_hw_dev, 0, sizeof(use_hw_dev));
        warn_indexes = 1;
        warn_version = 1;
+       warn_stack = 1;
        bd_warn_root = 1;
        popupmenu_btnup = 1;
        grab_input_focus = 1;
@@ -204,6 +207,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;
@@ -212,6 +216,7 @@ 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;
        bd_warn_root = that->bd_warn_root;
        popupmenu_btnup = that->popupmenu_btnup;
        grab_input_focus = that->grab_input_focus;
@@ -327,6 +332,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);
 
@@ -357,6 +364,7 @@ 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);
        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);
@@ -478,6 +486,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);
@@ -501,6 +510,7 @@ 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("BD_WARN_ROOT", bd_warn_root);
        defaults->update("POPUPMENU_BTNUP", popupmenu_btnup);
        defaults->update("GRAB_FOCUS", grab_input_focus);