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 f0afe996bf63c7d03c196c4bec0ab06787816d97..dbf14c49597688b74f7028d96815eca5948d527d 100644 (file)
--- 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;
@@ -86,8 +89,11 @@ Preferences::Preferences()
        project_smp = processors = calculate_processors(0);
        real_processors = calculate_processors(1);
        ffmpeg_marker_indexes = 1;
+       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;
@@ -98,6 +104,8 @@ Preferences::Preferences()
        yuv_color_space = BC_COLORS_BT601;
        yuv_color_range = BC_COLORS_JPEG;
        autocolor_assets = 0;
+       ctrl_toggle = 0;
+       rectify_audio = 0;
 
 // Default brender asset
        brender_asset = new Asset;
@@ -177,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);
@@ -199,13 +208,17 @@ 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;
        real_processors = that->real_processors;
        ffmpeg_marker_indexes = that->ffmpeg_marker_indexes;
+       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;
@@ -216,6 +229,8 @@ void Preferences::copy_from(Preferences *that)
        yuv_color_space = that->yuv_color_space;
        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();
@@ -313,22 +328,26 @@ int Preferences::load_defaults(BC_Hash *defaults)
        defaults->get("INDEX_DIRECTORY", index_directory);
        index_size = defaults->get("INDEX_SIZE", index_size);
        index_count = defaults->get("INDEX_COUNT", index_count);
+       use_thumbnails = defaults->get("USE_THUMBNAILS", use_thumbnails);
        keyframe_reticle = defaults->get("KEYFRAME_RETICLE", keyframe_reticle);
        perpetual_session = defaults->get("PERPETUAL_SESSION", perpetual_session);
        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 ) {
@@ -343,8 +362,12 @@ int Preferences::load_defaults(BC_Hash *defaults)
        project_smp = defaults->get("PROJECT_SMP", project_smp);
        force_uniprocessor = defaults->get("FORCE_UNIPROCESSOR", force_uniprocessor);
        ffmpeg_marker_indexes = defaults->get("FFMPEG_MARKER_INDEXES", ffmpeg_marker_indexes);
+       memset(&use_hw_dev, 0, sizeof(use_hw_dev));
+       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);
@@ -355,6 +378,8 @@ int Preferences::load_defaults(BC_Hash *defaults)
        yuv_color_space = defaults->get("YUV_COLOR_SPACE", yuv_color_space);
        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);
@@ -397,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; i<shbtns_total; ++i ) {
@@ -413,7 +436,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();
@@ -464,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);
@@ -483,8 +510,11 @@ int Preferences::save_defaults(BC_Hash *defaults)
        defaults->update("PROJECT_SMP", project_smp);
        defaults->update("FORCE_UNIPROCESSOR", force_uniprocessor);
        defaults->update("FFMPEG_MARKER_INDEXES", ffmpeg_marker_indexes);
+       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);
@@ -495,6 +525,8 @@ int Preferences::save_defaults(BC_Hash *defaults)
        defaults->update("YUV_COLOR_SPACE", yuv_color_space);
        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);
@@ -528,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<file_probes.size(); ++i ) {