histogram fix, use_thumbnails fix, zoom popup width tweak, cut/paste for mixer apply...

[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..6e7ffc914d72f2a3bc33c9737cbc81f84a27dcd0 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -98,6 +98,7 @@ Preferences::Preferences()
        yuv_color_space = BC_COLORS_BT601;
        yuv_color_range = BC_COLORS_JPEG;
        autocolor_assets = 0;
+       ctrl_toggle = 0;
 
 // Default brender asset
        brender_asset = new Asset;
@@ -216,6 +217,7 @@ 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;
        renderfarm_nodes.remove_all_objects();
        renderfarm_ports.remove_all();
        renderfarm_enabled.remove_all();
@@ -313,6 +315,7 @@ 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);
@@ -355,6 +358,7 @@ 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);
        use_brender = defaults->get("USE_BRENDER", use_brender);
        brender_fragment = defaults->get("BRENDER_FRAGMENT", brender_fragment);
        cache_size = defaults->get("CACHE_SIZE", cache_size);
@@ -495,6 +499,7 @@ 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);
        brender_asset->save_defaults(defaults, "BRENDER_", 1, 1, 1, 0, 0);
        defaults->update("USE_BRENDER", use_brender);
        defaults->update("BRENDER_FRAGMENT", brender_fragment);