fix problem of using opengl transitions with Motion51 when in OpenGL mode

[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 ad92bac8bd9979b2acb629fab291da7cef8d102c..2b8d84bd969414fd12d0923fb0e10dd4dfa0886c 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -93,7 +93,8 @@ Preferences::Preferences()
        ffmpeg_marker_indexes = 1;
        memset(&use_hw_dev, 0, sizeof(use_hw_dev));
        warn_indexes = 1;
-       warn_version = 1;
+       unsafe_gui = 0;
+       ongoing_backups = 0;
        warn_fileref = 1;
        bd_warn_root = 1;
        popupmenu_btnup = 1;
@@ -103,7 +104,7 @@ Preferences::Preferences()
        forward_render_displacement = 0;
        dvd_yuv420p_interlace = 0;
        highlight_inverse = 0xffffff;
-       yuv_color_space = BC_COLORS_BT601;
+       yuv_color_space = BC_COLORS_BT601_NTSC;
        yuv_color_range = BC_COLORS_JPEG;
        autocolor_assets = 0;
        ctrl_toggle = 1;
@@ -127,6 +128,9 @@ Preferences::Preferences()
        android_remote = 0;
        android_port = 23432;
        strcpy(android_pin, "cinelerra");
+       
+       fast_speed = 2.0;
+       slow_speed = 0.5;
 
        memset(channel_positions, 0, sizeof(channel_positions));
        int channels = 0;
@@ -200,6 +204,10 @@ void Preferences::copy_from(Preferences *that)
        android_remote = that->android_remote;
        android_port = that->android_port;
        strcpy(android_pin, that->android_pin);
+       
+       slow_speed = that->slow_speed;
+       fast_speed = that->fast_speed;
+       
        this->shbtn_prefs.remove_all_objects();
        for( int i=0; i<that->shbtn_prefs.size(); ++i )
                this->shbtn_prefs.append(new ShBtnPref(*that->shbtn_prefs[i]));
@@ -220,7 +228,8 @@ void Preferences::copy_from(Preferences *that)
        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;
+       unsafe_gui = that->unsafe_gui;
+       ongoing_backups = that->ongoing_backups;
        warn_fileref = that->warn_fileref;
        bd_warn_root = that->bd_warn_root;
        popupmenu_btnup = that->popupmenu_btnup;
@@ -320,6 +329,8 @@ void Preferences::scan_channels(char *string, int *channel_positions, int channe
        }
 }
 
+
+// TODO validation, otherwise corrupted/edited Cinelerra_rc crash app!
 int Preferences::load_defaults(BC_Hash *defaults)
 {
        char string[BCTEXTLEN];
@@ -328,6 +339,8 @@ int Preferences::load_defaults(BC_Hash *defaults)
        scan_commercials = defaults->get("SCAN_COMMERCIALS", scan_commercials);
        android_remote = defaults->get("ANDROID_REMOTE", android_remote);
        android_port = defaults->get("ANDROID_PORT", android_port);
+       fast_speed = defaults->get("FAST_SPEED", fast_speed);
+       slow_speed = defaults->get("SLOW_SPEED", slow_speed);
        defaults->get("ANDROID_PIN", android_pin);
        defaults->get("INDEX_DIRECTORY", index_directory);
        index_size = defaults->get("INDEX_SIZE", index_size);
@@ -347,6 +360,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
        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);
+       if (vicon_color_mode > ( MAX_VICON_COLOR_MODE -1 ) || vicon_color_mode <0) vicon_color_mode = 0;
        strcpy(theme, _(DEFAULT_THEME));
        strcpy(locale, DEFAULT_LOCALE);
        strcpy(plugin_icons, DEFAULT_PICON);
@@ -371,7 +385,8 @@ int Preferences::load_defaults(BC_Hash *defaults)
        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);
+       unsafe_gui = defaults->get("UNSAFE_GUI", unsafe_gui);
+       ongoing_backups = defaults->get("ONGOING_BACKUPS", ongoing_backups);
        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);
@@ -382,7 +397,9 @@ int Preferences::load_defaults(BC_Hash *defaults)
        dvd_yuv420p_interlace = defaults->get("DVD_YUV420P_INTERLACE", dvd_yuv420p_interlace);
        highlight_inverse = defaults->get("HIGHLIGHT_INVERSE", highlight_inverse);
        yuv_color_space = defaults->get("YUV_COLOR_SPACE", yuv_color_space);
+       if (yuv_color_space > (MAX_COLOR_SPACE - 1) || yuv_color_space < 0) yuv_color_space = 0;
        yuv_color_range = defaults->get("YUV_COLOR_RANGE", yuv_color_range);
+       if (yuv_color_range > (MAX_COLOR_RANGE - 1) || yuv_color_range < 0) yuv_color_range = 0;
        autocolor_assets = defaults->get("AUTOCOLOR_ASSETS", autocolor_assets);
        ctrl_toggle = defaults->get("CTRL_TOGGLE", ctrl_toggle);
        rectify_audio = defaults->get("RECTIFY_AUDIO", rectify_audio);
@@ -487,7 +504,8 @@ int Preferences::save_defaults(BC_Hash *defaults)
        defaults->update("ANDROID_REMOTE", android_remote);
        defaults->update("ANDROID_PIN", android_pin);
        defaults->update("ANDROID_PORT", android_port);
-
+       defaults->update("SLOW_SPEED", slow_speed);
+       defaults->update("FAST_SPEED", fast_speed);
        defaults->update("CACHE_SIZE", cache_size);
        defaults->update("CACHE_TRANSITIONS", cache_transitions);
        defaults->update("INDEX_DIRECTORY", index_directory);
@@ -522,7 +540,8 @@ int Preferences::save_defaults(BC_Hash *defaults)
        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("UNSAFE_GUI", unsafe_gui);
+       defaults->update("ONGOING_BACKUPS", ongoing_backups);
        defaults->update("WARN_FILEREF", warn_fileref);
        defaults->update("BD_WARN_ROOT", bd_warn_root);
        defaults->update("POPUPMENU_BTNUP", popupmenu_btnup);