X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferences.C;h=dbffa1799942b8af63ea80cfa8f4fe27cd20c84a;hb=e21da84b50724b40b38b5e0373d1a25e587169ee;hp=6f4e57c995481e371d6203756fe96dfc78473545;hpb=54b918a8b84f666bf32548ebd12b93908061d2a6;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index 6f4e57c9..dbffa179 100644
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -2,6 +2,7 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -104,7 +105,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;
@@ -128,6 +129,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;
@@ -201,6 +205,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]));
@@ -322,6 +330,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];
@@ -330,6 +340,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);
@@ -349,6 +361,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);
@@ -385,7 +398,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);
@@ -437,6 +452,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
 		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"));
+		shbtn_prefs.append(new ShBtnPref(_("Delete brender files in tmp"), "$CIN_DAT/doc/brender_tmp_delete.sh"));
 		shbtns_total = 0;
 	}
 	for( int i=0; i<shbtns_total; ++i ) {
@@ -490,7 +506,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);