X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fgradient%2Fgradient.C;h=9b49f85c2770cf96b9c2e98bda86883d37e87f76;hb=15ae384acd95de544db3986ace65e870b0c0b2c6;hp=66cf7bb99c464b037e663eede159d1f10a82717a;hpb=9af254e7a14aca7d7ef005cba48754da6b7a4579;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/gradient/gradient.C b/cinelerra-5.1/plugins/gradient/gradient.C
index 66cf7bb9..9b49f85c 100644
--- a/cinelerra-5.1/plugins/gradient/gradient.C
+++ b/cinelerra-5.1/plugins/gradient/gradient.C
@@ -45,6 +45,12 @@ REGISTER_PLUGIN(GradientMain)
 
 
 GradientConfig::GradientConfig()
+{
+	reset();
+}
+
+void GradientConfig::reset()
+
 {
 	angle = 0;
 	in_radius = 0;
@@ -211,6 +217,8 @@ void GradientWindow::create_objects()
 	BC_Title *title2;
 	add_subwindow(title2 = new BC_Title(x, y, _("Outer radius:")));
 
+	add_subwindow(reset = new GradientReset(plugin, this, x, y+100));
+
 	y = y1;
 	x += MAX(title1->get_w(), title2->get_w()) + margin;
 
@@ -225,7 +233,6 @@ void GradientWindow::create_objects()
 	add_subwindow(in_color = new GradientInColorButton(plugin, this, x, y));
 	y += COLOR_H + margin;
 
-
 	add_subwindow(out_color = new GradientOutColorButton(plugin, this, x, y));
 	x += MAX(in_color->get_w(), out_color->get_w()) + margin;
 	y = y1;
@@ -253,6 +260,7 @@ void GradientWindow::create_objects()
 		COLOR_H + 4,
 		1);
 
+
 	show_window();
 }
 
@@ -537,7 +545,20 @@ int GradientOutColorButton::handle_event()
 	return 1;
 }
 
+GradientReset::GradientReset(GradientMain *plugin, GradientWindow *window, int x, int y)
+ : BC_GenericButton(x, y, _("Reset"))
+{
+	this->plugin = plugin;
+	this->window = window;
+}
 
+int GradientReset::handle_event()
+{
+	plugin->config.reset();
+	window->update_gui();
+	plugin->send_configure_change();
+	return 1;
+}
 
 GradientInColorThread::GradientInColorThread(GradientMain *plugin,
 	GradientWindow *window)
@@ -689,12 +710,9 @@ int GradientMain::process_buffer(VFrame *frame,
 		gradient = 0;
 	}
 
-	if(!gradient) gradient = new VFrame(0,
-		-1,
-		input->get_w(),
-		input->get_h(),
-		gradient_cmodel,
-		-1);
+	if(!gradient)
+		gradient = new VFrame(input->get_w(), input->get_h(),
+			gradient_cmodel, 0);
 
 	if(!engine) engine = new GradientServer(this,
 		get_project_smp() + 1,
@@ -727,32 +745,32 @@ int GradientMain::process_buffer(VFrame *frame,
 
 void GradientMain::update_gui()
 {
-	if(thread)
-	{
-		if(load_configuration())
-		{
-			((GradientWindow*)thread->window)->lock_window("GradientMain::update_gui");
-			((GradientWindow*)thread->window)->rate->set_text(GradientRate::to_text(config.rate));
-			((GradientWindow*)thread->window)->in_radius->update(config.in_radius);
-			((GradientWindow*)thread->window)->out_radius->update(config.out_radius);
-			((GradientWindow*)thread->window)->shape->set_text(GradientShape::to_text(config.shape));
-			if(((GradientWindow*)thread->window)->angle)
-				((GradientWindow*)thread->window)->angle->update(config.angle);
-			if(((GradientWindow*)thread->window)->center_x)
-				((GradientWindow*)thread->window)->center_x->update(config.center_x);
-			if(((GradientWindow*)thread->window)->center_y)
-				((GradientWindow*)thread->window)->center_y->update(config.center_y);
-			((GradientWindow*)thread->window)->update_in_color();
-			((GradientWindow*)thread->window)->update_out_color();
-			((GradientWindow*)thread->window)->update_shape();
-			((GradientWindow*)thread->window)->unlock_window();
-			((GradientWindow*)thread->window)->in_color_thread->update_gui(config.get_in_color(), config.in_a);
-			((GradientWindow*)thread->window)->out_color_thread->update_gui(config.get_out_color(), config.out_a);
-		}
-	}
+	if( !thread ) return;
+	if( !load_configuration() ) return;
+	((GradientWindow*)thread->window)->lock_window("GradientMain::update_gui");
+	GradientWindow *window = (GradientWindow *)thread->window;
+	window->update_gui();
+	window->unlock_window();
 }
 
-
+void GradientWindow::update_gui()
+{
+	GradientConfig &config = plugin->config;
+	rate->set_text(GradientRate::to_text(config.rate));
+	in_radius->update(config.in_radius);
+	out_radius->update(config.out_radius);
+	shape->set_text(GradientShape::to_text(config.shape));
+	if( angle ) angle->update(config.angle);
+	if( center_x ) center_x->update(config.center_x);
+	if( center_y ) center_y->update(config.center_y);
+	update_in_color();
+	update_out_color();
+	update_shape();
+	unlock_window();
+	in_color_thread->update_gui(config.get_in_color(), config.in_a);
+	out_color_thread->update_gui(config.get_out_color(), config.out_a);
+	lock_window("GradientWindow::update_gui");
+}
 
 
 void GradientMain::save_data(KeyFrame *keyframe)
@@ -965,14 +983,14 @@ int GradientMain::handle_opengl()
 			{
 				float in1, in2, in3, in4;
 				float out1, out2, out3, out4;
-				YUV::rgb_to_yuv_f((float)config.in_r / 0xff,
+				YUV::yuv.rgb_to_yuv_f((float)config.in_r / 0xff,
 					(float)config.in_g / 0xff,
 					(float)config.in_b / 0xff,
 					in1,
 					in2,
 					in3);
 				in4 = (float)config.in_a / 0xff;
-				YUV::rgb_to_yuv_f((float)config.out_r / 0xff,
+				YUV::yuv.rgb_to_yuv_f((float)config.out_r / 0xff,
 					(float)config.out_g / 0xff,
 					(float)config.out_b / 0xff,
 					out1,