X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fyuvshift%2Fyuvshift.C;h=fe5a0c9acc534ebddcad7c6e23d9069067bc3bce;hb=686c4d754c80b9865c0a5a7315c5fa4d0d39f4a7;hp=3f68a6c8bcc07e4025f451f408a7b2d0bcf5af8f;hpb=54cc56bff09f5004b2a6cd454375f06e56acf5a0;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/yuvshift/yuvshift.C b/cinelerra-5.1/plugins/yuvshift/yuvshift.C
index 3f68a6c8..fe5a0c9a 100644
--- a/cinelerra-5.1/plugins/yuvshift/yuvshift.C
+++ b/cinelerra-5.1/plugins/yuvshift/yuvshift.C
@@ -32,14 +32,31 @@ REGISTER_PLUGIN(YUVShiftEffect)
 
 YUVShiftConfig::YUVShiftConfig()
 {
-	reset();
+	reset(RESET_ALL);
 }
 
-void YUVShiftConfig::reset()
+void YUVShiftConfig::reset(int clear)
 {
-	y_dx = y_dy = 0;
-	u_dx = u_dy = 0;
-	v_dx = v_dy = 0;
+	switch(clear) {
+		case RESET_Y_DX : y_dx = 0;
+			break;
+		case RESET_Y_DY : y_dy = 0;
+			break;
+		case RESET_U_DX : u_dx = 0;
+			break;
+		case RESET_U_DY : u_dy = 0;
+			break;
+		case RESET_V_DX : v_dx = 0;
+			break;
+		case RESET_V_DY : v_dy = 0;
+			break;
+		case RESET_ALL :
+		default:
+			y_dx = y_dy = 0;
+			u_dx = u_dy = 0;
+			v_dx = v_dy = 0;
+			break;
+	}
 }
 
 void YUVShiftConfig::copy_from(YUVShiftConfig &src)
@@ -80,7 +97,7 @@ void YUVShiftConfig::interpolate(YUVShiftConfig &prev,
 #define MAXVALUE 100
 
 YUVShiftLevel::YUVShiftLevel(YUVShiftEffect *plugin, int *output, int x, int y)
- : BC_ISlider(x, y, 0, 200, 200, -MAXVALUE, MAXVALUE, *output)
+ : BC_ISlider(x, y, 0, xS(200), yS(200), -MAXVALUE, MAXVALUE, *output)
 {
 	this->plugin = plugin;
 	this->output = output;
@@ -105,41 +122,79 @@ YUVShiftReset::~YUVShiftReset()
 }
 int YUVShiftReset::handle_event()
 {
-	plugin->config.reset();
-	window->update();
+	plugin->config.reset(RESET_ALL);
+	window->update_gui(RESET_ALL);
+	plugin->send_configure_change();
+	return 1;
+}
+
+
+YUVShiftSliderClr::YUVShiftSliderClr(YUVShiftEffect *plugin, YUVShiftWindow *window, int x, int y, int w, int clear)
+ : BC_Button(x, y, w, plugin->get_theme()->get_image_set("reset_button"))
+{
+	this->plugin = plugin;
+	this->window = window;
+	this->clear = clear;
+}
+YUVShiftSliderClr::~YUVShiftSliderClr()
+{
+}
+int YUVShiftSliderClr::handle_event()
+{
+	// clear==1 ==> y_dx slider --- clear==2 ==> y_dy slider
+	// clear==3 ==> u_dx slider --- clear==4 ==> u_dy slider
+	// clear==5 ==> v_dx slider --- clear==6 ==> v_dy slider
+	plugin->config.reset(clear);
+	window->update_gui(clear);
 	plugin->send_configure_change();
 	return 1;
 }
 
 
 YUVShiftWindow::YUVShiftWindow(YUVShiftEffect *plugin)
- : PluginClientWindow(plugin, 300, 230, 300, 230, 0)
+ : PluginClientWindow(plugin, xS(320), yS(230), xS(320), yS(230), 0)
 {
 	this->plugin = plugin;
 }
 
 void YUVShiftWindow::create_objects()
 {
-	int x = 10, y = 10, x1 = 50;
+	int xs10 = xS(10), xs50 = xS(50);
+	int ys10 = yS(10), ys30 = yS(30), ys40 = yS(40);
+	int x = xs10, y = ys10, x1 = xs50;
+	int x2 = 0; int clrBtn_w = xs50;
+
 	add_subwindow(new BC_Title(x, y, _("Y_dx:")));
 	add_subwindow(y_dx = new YUVShiftLevel(plugin, &plugin->config.y_dx, x1, y));
-	y += 30;
+	x2 = x1 + y_dx->get_w() + xs10;
+	add_subwindow(y_dxClr = new YUVShiftSliderClr(plugin, this, x2, y, clrBtn_w, RESET_Y_DX));
+
+	y += ys30;
 	add_subwindow(new BC_Title(x, y, _("Y_dy:")));
 	add_subwindow(y_dy = new YUVShiftLevel(plugin, &plugin->config.y_dy, x1, y));
-	y += 30;
+	add_subwindow(y_dyClr = new YUVShiftSliderClr(plugin, this, x2, y, clrBtn_w, RESET_Y_DY));
+
+	y += ys30;
 	add_subwindow(new BC_Title(x, y, _("U_dx:")));
 	add_subwindow(u_dx = new YUVShiftLevel(plugin, &plugin->config.u_dx, x1, y));
-	y += 30;
+	add_subwindow(u_dxClr = new YUVShiftSliderClr(plugin, this, x2, y, clrBtn_w, RESET_U_DX));
+
+	y += ys30;
 	add_subwindow(new BC_Title(x, y, _("U_dy:")));
 	add_subwindow(u_dy = new YUVShiftLevel(plugin, &plugin->config.u_dy, x1, y));
-	y += 30;
+	add_subwindow(u_dyClr = new YUVShiftSliderClr(plugin, this, x2, y, clrBtn_w, RESET_U_DY));
+
+	y += ys30;
 	add_subwindow(new BC_Title(x, y, _("V_dx:")));
 	add_subwindow(v_dx = new YUVShiftLevel(plugin, &plugin->config.v_dx, x1, y));
-	y += 30;
+	add_subwindow(v_dxClr = new YUVShiftSliderClr(plugin, this, x2, y, clrBtn_w, RESET_V_DX));
+
+	y += ys30;
 	add_subwindow(new BC_Title(x, y, _("V_dy:")));
 	add_subwindow(v_dy = new YUVShiftLevel(plugin, &plugin->config.v_dy, x1, y));
+	add_subwindow(v_dyClr = new YUVShiftSliderClr(plugin, this, x2, y, clrBtn_w, RESET_V_DY));
 
-	y += 40;
+	y += ys40;
 	add_subwindow(reset = new YUVShiftReset(plugin, this, x, y));
 
 	show_window();
@@ -148,14 +203,31 @@ void YUVShiftWindow::create_objects()
 
 
 // for Reset button
-void YUVShiftWindow::update()
+void YUVShiftWindow::update_gui(int clear)
 {
-	y_dx->update(plugin->config.y_dx);
-	y_dy->update(plugin->config.y_dy);
-	u_dx->update(plugin->config.u_dx);
-	u_dy->update(plugin->config.u_dy);
-	v_dx->update(plugin->config.v_dx);
-	v_dy->update(plugin->config.v_dy);
+	switch(clear) {
+		case RESET_Y_DX : y_dx->update(plugin->config.y_dx);
+			break;
+		case RESET_Y_DY : y_dy->update(plugin->config.y_dy);
+			break;
+		case RESET_U_DX : u_dx->update(plugin->config.u_dx);
+			break;
+		case RESET_U_DY : u_dy->update(plugin->config.u_dy);
+			break;
+		case RESET_V_DX : v_dx->update(plugin->config.v_dx);
+			break;
+		case RESET_V_DY : v_dy->update(plugin->config.v_dy);
+			break;
+		case RESET_ALL :
+		default:
+			y_dx->update(plugin->config.y_dx);
+			y_dy->update(plugin->config.y_dy);
+			u_dx->update(plugin->config.u_dx);
+			u_dy->update(plugin->config.u_dy);
+			v_dx->update(plugin->config.v_dx);
+			v_dy->update(plugin->config.v_dy);
+			break;
+	}
 }