X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.C;h=c0fc37cc3cf0272f6c64f1b4ac0f892cd8a8a6c4;hb=22c6251d37911a11e322bf7518e6a992ea0bb6c7;hp=2f284b10be9397fa76b0a4a6f2088a1e1606f6ea;hpb=5d8a7826b0f80f00622e46baf75453995a76e343;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C
index 2f284b10..c0fc37cc 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.C
+++ b/cinelerra-5.1/cinelerra/cwindowtool.C
@@ -37,6 +37,7 @@
 #include "filexml.h"
 #include "floatauto.h"
 #include "floatautos.h"
+#include "gwindowgui.h"
 #include "keys.h"
 #include "language.h"
 #include "localsession.h"
@@ -52,6 +53,7 @@
 #include "tracks.h"
 #include "trackcanvas.h"
 #include "transportque.h"
+#include "zoombar.h"
 
 
 CWindowTool::CWindowTool(MWindow *mwindow, CWindowGUI *gui)
@@ -271,6 +273,7 @@ CWindowToolGUI::CWindowToolGUI(MWindow *mwindow,
 	this->mwindow = mwindow;
 	this->thread = thread;
 	current_operation = 0;
+	span = 1;  edge = 0;
 }
 
 CWindowToolGUI::~CWindowToolGUI()
@@ -325,6 +328,23 @@ int CWindowToolGUI::translation_event()
 	return 0;
 }
 
+void CWindowToolGUI::update_auto(Track *track, int idx, CWindowCoord *vp)
+{
+	FloatAuto *float_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
+			track->automation->autos[idx], 1);
+	if( !float_auto ) return;
+	float v = float_auto->get_value(edge);
+	float t = atof(vp->get_text());
+	if( v == t ) return;
+	float_auto->bump_value(t, edge, span);
+	if( idx == AUTOMATION_PROJECTOR_Z || idx == AUTOMATION_CAMERA_Z ) {
+		mwindow->gui->lock_window("CWindowToolGUI::update_auto");
+		mwindow->gui->draw_overlays(1);
+		mwindow->gui->unlock_window();
+	}
+	update();
+	update_preview();
+}
 
 void CWindowToolGUI::update_preview(int changed_edl)
 {
@@ -343,25 +363,152 @@ void CWindowToolGUI::draw_preview(int changed_edl)
 }
 
 
-CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, float value, int log_increment = 0)
+CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, float value, int type)
  : BC_TumbleTextBox(gui, (float)value, (float)-65536, (float)65536, x, y, xS(70), 3)
 {
 	this->gui = gui;
-	set_log_floatincrement(log_increment);
+	this->type = type;
+	slider = 0;
+	range = 0;
 }
 
-CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, int value)
+CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, int value, int type)
  : BC_TumbleTextBox(gui, (int64_t)value, (int64_t)-65536, (int64_t)65536, x, y, xS(70))
 {
 	this->gui = gui;
+	this->type = type;
+	slider = 0;
+	range = 0;
+}
+
+void CWindowCoord::create_objects()
+{
+	BC_TumbleTextBox::create_objects();
+	if( type >= 0 ) {
+		int x1 = get_x() + BC_TumbleTextBox::get_w() + xS(10), y1 = get_y();
+		int group = Automation::autogrouptype(type, 0);
+		float min = gui->mwindow->edl->local_session->automation_mins[group];
+		float max = gui->mwindow->edl->local_session->automation_maxs[group];
+		float v = atof(get_text());
+		gui->add_subwindow(slider = new CWindowCoordSlider(this,
+				x1, y1, xS(150), min, max, v));
+		x1 += slider->get_w() + xS(5);
+		gui->add_subwindow(range = new CWindowCoordRange(this, x1, y1));
+	}
+}
+
+void CWindowCoord::update_gui(float value)
+{
+	BC_TumbleTextBox::update(value);
+	if( slider ) {
+		int group = Automation::autogrouptype(type, 0);
+		LocalSession *local_session = gui->mwindow->edl->local_session;
+		slider->update(slider->get_pointer_motion_range(), value,
+			local_session->automation_mins[group],
+			local_session->automation_maxs[group]);
+		int x1 = range->get_x() + range->get_w() + xS(5);
+		int y1 = range->get_y() - yS(2), d = xS(16);
+		gui->set_color(GWindowGUI::auto_colors[type]);
+		gui->draw_disc(x1, y1, d, d);
+	}
 }
+
 int CWindowCoord::handle_event()
 {
+	if( slider )
+		slider->update(atof(get_text()));
 	gui->event_caller = this;
 	gui->handle_event();
 	return 1;
 }
 
+CWindowCoordSlider::CWindowCoordSlider(CWindowCoord *coord,
+		int x, int y, int w, float mn, float mx, float value)
+ : BC_FSlider(x, y, 0, w, w, mn, mx, value)
+{
+	this->coord = coord;
+	set_precision(0.01);
+}
+
+CWindowCoordSlider::~CWindowCoordSlider()
+{
+}
+
+int CWindowCoordSlider::handle_event()
+{
+	float value = get_value();
+	coord->update(value);
+	coord->gui->event_caller = coord;
+	coord->gui->handle_event();
+	return 1;
+}
+
+CWindowCoordRange::CWindowCoordRange(CWindowCoord *coord, int x, int y)
+ : BC_Tumbler(x, y)
+{
+	this->coord = coord;
+}
+CWindowCoordRange::~CWindowCoordRange()
+{
+}
+
+int CWindowCoordRange::update(float scale)
+{
+	CWindowCoordSlider *slider = coord->slider;
+	MWindow *mwindow = coord->gui->mwindow;
+	LocalSession *local_session = mwindow->edl->local_session;
+	int group = Automation::autogrouptype(coord->type, 0);
+	float min = local_session->automation_mins[group];
+	float max = local_session->automation_maxs[group];
+	if( min >= max ) {
+		switch( group ) {
+		case AUTOGROUPTYPE_ZOOM: min = 0.005;  max = 5.0;  break;
+		case AUTOGROUPTYPE_X:    min = -100;   max = 100;  break;
+		case AUTOGROUPTYPE_Y:    min = -100;   max = 100;  break;
+		}
+	}
+	switch( group ) {
+	case AUTOGROUPTYPE_ZOOM: { // exp
+		float lv = log(slider->get_value());
+		float lmin = log(min), lmax = log(max);
+		float lr = (lmax - lmin) * scale;
+		min = exp(lv - 0.5*lr);
+		max = exp(lv + 0.5*lr);
+		if( min < 0.001 ) min = 0.001;
+		if( max > 1000. ) max = 1000.;
+		break; }
+	case AUTOGROUPTYPE_X:
+	case AUTOGROUPTYPE_Y: { // linear
+		float dr = (max - min) * (scale-1);
+		if( (min -= dr) < -32767 ) min = -32767;
+		if( (max += dr) >  32767 ) max =  32767;
+		break; }
+	}
+	slider->update(slider->get_pointer_motion_range(),
+			slider->get_value(), min, max);
+	unlock_window();
+	MWindowGUI *mgui = mwindow->gui;
+	mgui->lock_window("CWindowCoordRange::update");
+	local_session->zoombar_showautotype = group;
+	local_session->automation_mins[group] = min;
+	local_session->automation_maxs[group] = max;
+	mgui->zoombar->update_autozoom();
+	mgui->draw_overlays(0);
+	mgui->update_patchbay();
+	mgui->flash_canvas(1);
+	mgui->unlock_window();
+	lock_window("CWindowCoordRange::update");
+	return 1;
+}
+
+int CWindowCoordRange::handle_up_event()
+{
+	return update(1.25);
+}
+int CWindowCoordRange::handle_down_event()
+{
+	return update(0.8);
+}
 
 CWindowCropApply::CWindowCropApply(MWindow *mwindow, CWindowCropGUI *crop_gui, int x, int y)
  : BC_GenericButton(x, y, _("Apply"))
@@ -692,30 +839,27 @@ struct _CVD {
 	const char* tooltip;
 };
 
-const _CVD Camera_Crv_Smooth =
-	{	FloatAuto::SMOOTH,
-		true,
-		"tan_smooth",
-		N_("\"smooth\" Curve on current Camera Keyframes")
-	};
-const _CVD Camera_Crv_Linear =
-	{	FloatAuto::LINEAR,
-		true,
-		"tan_linear",
-		N_("\"linear\" Curve on current Camera Keyframes")
-	};
-const _CVD Projector_Crv_Smooth =
-	{	FloatAuto::SMOOTH,
-		false,
-		"tan_smooth",
-		N_("\"smooth\" Curve on current Projector Keyframes")
-	};
-const _CVD Projector_Crv_Linear =
-	{	FloatAuto::LINEAR,
-		false,
-		"tan_linear",
-		N_("\"linear\" Curve on current Projector Keyframes")
-	};
+const _CVD Camera_Crv_Smooth = { FloatAuto::SMOOTH, true, "tan_smooth",
+		N_("\"smooth\" Curve on current Camera Keyframes") };
+const _CVD Camera_Crv_Linear = { FloatAuto::LINEAR, true, "tan_linear",
+		N_("\"linear\" Curve on current Camera Keyframes") };
+const _CVD Camera_Crv_Tangent = { FloatAuto::TFREE, true, "tan_tangent",
+		N_("\"tangent\" Curve on current Camera Keyframes") };
+const _CVD Camera_Crv_Free  = { FloatAuto::FREE, true, "tan_free",
+		N_("\"free\" Curve on current Camera Keyframes") };
+const _CVD Camera_Crv_Bump = { FloatAuto::BUMP, true, "tan_bump",
+		N_("\"bump\" Curve on current Camera Keyframes") };
+
+const _CVD Projector_Crv_Smooth = { FloatAuto::SMOOTH, false, "tan_smooth",
+		N_("\"smooth\" Curve on current Projector Keyframes") };
+const _CVD Projector_Crv_Linear = { FloatAuto::LINEAR, false, "tan_linear",
+		N_("\"linear\" Curve on current Projector Keyframes") };
+const _CVD Projector_Crv_Tangent = { FloatAuto::TFREE, false, "tan_tangent",
+		N_("\"tangent\" Curve on current Projector Keyframes") };
+const _CVD Projector_Crv_Free  = { FloatAuto::FREE, false, "tan_free",
+		N_("\"free\" Curve on current Projector Keyframes") };
+const _CVD Projector_Crv_Bump = { FloatAuto::BUMP, false, "tan_bump",
+		N_("\"bump\" Curve on current Projector Keyframes") };
 
 // Implementation Class für Keyframe Curve Mode buttons
 //
@@ -728,17 +872,19 @@ const _CVD Projector_Crv_Linear =
 class CWindowCurveToggle : public BC_Toggle
 {
 public:
-	CWindowCurveToggle(_CVD mode, MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	CWindowCurveToggle(const _CVD &mode,
+			MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
 	void check_toggle_state(FloatAuto *x, FloatAuto *y, FloatAuto *z);
 	int handle_event();
 private:
-	_CVD cfg;
+	const _CVD &cfg;
 	MWindow *mwindow;
 	CWindowToolGUI *gui;
 };
 
 
-CWindowCurveToggle::CWindowCurveToggle(_CVD mode, MWindow *mwindow, CWindowToolGUI *gui, int x, int y)
+CWindowCurveToggle::CWindowCurveToggle(const _CVD &mode,
+			MWindow *mwindow, CWindowToolGUI *gui, int x, int y)
  : BC_Toggle(x, y, mwindow->theme->get_image_set(mode.icon_id), false),
    cfg(mode)
 {
@@ -796,7 +942,7 @@ int CWindowEyedropCheckBox::handle_event()
 
 
 CWindowCameraGUI::CWindowCameraGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Camera"), xS(170), yS(170))
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Camera"), xS(340), yS(170))
 {
 }
 CWindowCameraGUI::~CWindowCameraGUI()
@@ -807,11 +953,12 @@ void CWindowCameraGUI::create_objects()
 {
 	int xs10 = xS(10), xs15 = xS(15);
 	int ys10 = yS(10), ys30 = yS(30);
-	int x = xs10, y = ys10, x1;
+	int x = xs10, y = ys10;
 	Track *track = mwindow->cwindow->calculate_affected_track();
 	FloatAuto *x_auto = 0, *y_auto = 0, *z_auto = 0;
 	BC_Title *title;
 	BC_Button *button;
+	span = 1;  edge = 0;
 
 	lock_window("CWindowCameraGUI::create_objects");
 	if( track ) {
@@ -820,27 +967,25 @@ void CWindowCameraGUI::create_objects()
 	}
 
 	add_subwindow(title = new BC_Title(x, y, "X:"));
-	x += title->get_w();
-	this->x = new CWindowCoord(this, x, y,
-		x_auto ? x_auto->get_value() : (float)0);
+	int x1 = x + title->get_w() + xS(3);
+	float xvalue = x_auto ? x_auto->get_value() : 0;
+	this->x = new CWindowCoord(this, x1, y, xvalue, AUTOMATION_CAMERA_X);
 	this->x->create_objects();
-
-
+	this->x->range->set_tooltip(_("expand X range"));
 	y += ys30;
-	x = xs10;
-	add_subwindow(title = new BC_Title(x, y, "Y:"));
-	x += title->get_w();
-	this->y = new CWindowCoord(this, x, y,
-		y_auto ? y_auto->get_value() : (float)0);
+	add_subwindow(title = new BC_Title(x = xs10, y, "Y:"));
+	float yvalue = y_auto ? y_auto->get_value() : 0;
+	this->y = new CWindowCoord(this, x1, y, yvalue, AUTOMATION_CAMERA_Y);
 	this->y->create_objects();
+	this->y->range->set_tooltip(_("expand Y range"));
 	y += ys30;
-	x = xs10;
-	add_subwindow(title = new BC_Title(x, y, "Z:"));
+	add_subwindow(title = new BC_Title(x = xs10, y, "Z:"));
 	x += title->get_w();
-	this->z = new CWindowCoord(this, x, y,
-		z_auto ? z_auto->get_value() : (float)1);
+	float zvalue = z_auto ? z_auto->get_value() : 1;
+	this->z = new CWindowCoord(this, x1, y, zvalue, AUTOMATION_CAMERA_Z);
 	this->z->create_objects();
 	this->z->set_increment(0.01);
+	this->z->range->set_tooltip(_("expand Zoom range"));
 
 	y += ys30;
 	x1 = xs10;
@@ -851,9 +996,15 @@ void CWindowCameraGUI::create_objects()
 	add_subwindow(button = new CWindowCameraRight(mwindow, this, x1, y));
 // additional Buttons to control the curve mode of the "current" keyframe
 	x1 += button->get_w() + xs15;
-	add_subwindow(this->t_smooth = new CWindowCurveToggle(Camera_Crv_Smooth, mwindow, this, x1, y));
-	x1 += button->get_w() + xs10;
-	add_subwindow(this->t_linear = new CWindowCurveToggle(Camera_Crv_Linear, mwindow, this, x1, y));
+	add_subwindow(t_smooth = new CWindowCurveToggle(Camera_Crv_Smooth, mwindow, this, x1, y));
+	x1 += t_smooth->get_w() + xs10;
+	add_subwindow(t_linear = new CWindowCurveToggle(Camera_Crv_Linear, mwindow, this, x1, y));
+	x1 += t_linear->get_w() + xs10;
+	add_subwindow(t_tangent = new CWindowCurveToggle(Camera_Crv_Tangent, mwindow, this, x1, y));
+	x1 += t_tangent->get_w() + xs10;
+	add_subwindow(t_free = new CWindowCurveToggle(Camera_Crv_Free, mwindow, this, x1, y));
+	x1 += t_free->get_w() + xs10;
+	add_subwindow(t_bump = new CWindowCurveToggle(Camera_Crv_Bump, mwindow, this, x1, y));
 
 	y += button->get_h();
 	x1 = xs10;
@@ -863,9 +1014,13 @@ void CWindowCameraGUI::create_objects()
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowCameraBottom(mwindow, this, x1, y));
 	x1 += button->get_w() + xs15;
-	add_subwindow(this->add_keyframe = new CWindowCameraAddKeyframe(mwindow, this, x1, y));
-	x1 += button->get_w() + xs10;
-	add_subwindow(this->reset = new CWindowCameraReset(mwindow, this, x1, y));
+	add_subwindow(add_keyframe = new CWindowCameraAddKeyframe(mwindow, this, x1, y));
+	x1 += add_keyframe->get_w() + xs15;
+	add_subwindow(auto_edge = new CWindowCurveAutoEdge(mwindow, this, x1, y));
+	x1 += auto_edge->get_w() + xs10;
+	add_subwindow(auto_span = new CWindowCurveAutoSpan(mwindow, this, x1, y));
+	x1 += auto_span->get_w() + xs15;
+	add_subwindow(reset = new CWindowCameraReset(mwindow, this, x1, y));
 
 // fill in current auto keyframe values, set toggle states.
 	this->update();
@@ -874,62 +1029,16 @@ void CWindowCameraGUI::create_objects()
 
 void CWindowCameraGUI::handle_event()
 {
-	FloatAuto *x_auto = 0;
-	FloatAuto *y_auto = 0;
-	FloatAuto *z_auto = 0;
 	Track *track = mwindow->cwindow->calculate_affected_track();
-	if(track)
-	{
-		mwindow->undo->update_undo_before(_("camera"), this);
-		if(event_caller == x)
-		{
-			x_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_CAMERA_X], 1);
-			if(x_auto)
-			{
-				x_auto->set_value(atof(x->get_text()));
-				update();
-				update_preview();
-			}
-		}
-		else
-		if(event_caller == y)
-		{
-			y_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_CAMERA_Y], 1);
-			if(y_auto)
-			{
-				y_auto->set_value(atof(y->get_text()));
-				update();
-				update_preview();
-			}
-		}
-		else
-		if(event_caller == z)
-		{
-			z_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_CAMERA_Z], 1);
-			if(z_auto)
-			{
-				float zoom = atof(z->get_text());
-				if(zoom > 100.) zoom = 100.;
-				else
-				if(zoom < 0.01) zoom = 0.01;
-	// Doesn't allow user to enter from scratch
-	// 		if(zoom != atof(z->get_text()))
-	// 			z->update(zoom);
-
-				z_auto->set_value(zoom);
-				mwindow->gui->lock_window("CWindowCameraGUI::handle_event");
-				mwindow->gui->draw_overlays(1);
-				mwindow->gui->unlock_window();
-				update();
-				update_preview();
-			}
-		}
-
-		mwindow->undo->update_undo_after(_("camera"), LOAD_ALL);
-	}
+	if( !track ) return;
+	mwindow->undo->update_undo_before(_("camera"), this);
+	if( event_caller == x )
+		update_auto(track, AUTOMATION_CAMERA_X, x);
+	else if( event_caller == y )
+		update_auto(track, AUTOMATION_CAMERA_Y, y);
+	else if( event_caller == z )
+		update_auto(track, AUTOMATION_CAMERA_Z, z);
+	mwindow->undo->update_undo_after(_("camera"), LOAD_ALL);
 }
 
 void CWindowCameraGUI::update()
@@ -938,27 +1047,44 @@ void CWindowCameraGUI::update()
 	FloatAuto *y_auto = 0;
 	FloatAuto *z_auto = 0;
 	Track *track = mwindow->cwindow->calculate_affected_track();
+	int bg_color = get_resources()->text_background;
+	int hi_color = bg_color ^ 0x444444;
 	if( track ) {
 		mwindow->cwindow->calculate_affected_autos(track,
 			&x_auto, &y_auto, &z_auto, 1, 0, 0, 0);
 	}
 
-	if(x_auto)
-		x->update(x_auto->get_value());
-	if(y_auto)
-		y->update(y_auto->get_value());
-	if(z_auto) {
-		float value = z_auto->get_value();
-		z->update(value);
+	if( x_auto ) {
+		int color = (edge || span) && x_auto->curve_mode == FloatAuto::BUMP ?
+			hi_color : bg_color;
+		x->get_textbox()->set_back_color(color);
+		float xvalue = x_auto->get_value(edge);
+		x->update_gui(xvalue);
+	}
+	if( y_auto ) {
+		int color = (edge || span) && y_auto->curve_mode == FloatAuto::BUMP ?
+			hi_color : bg_color;
+		y->get_textbox()->set_back_color(color);
+		float yvalue = y_auto->get_value(edge);
+		y->update_gui(yvalue);
+	}
+	if( z_auto ) {
+		int color = (edge || span) && z_auto->curve_mode == FloatAuto::BUMP ?
+			hi_color : bg_color;
+		z->get_textbox()->set_back_color(color);
+		float zvalue = z_auto->get_value(edge);
+		z->update_gui(zvalue);
 		thread->gui->lock_window("CWindowCameraGUI::update");
-		thread->gui->composite_panel->cpanel_zoom->update(value);
+		thread->gui->composite_panel->cpanel_zoom->update(zvalue);
 		thread->gui->unlock_window();
 	}
 
-	if( x_auto && y_auto && z_auto )
-	{
+	if( x_auto && y_auto && z_auto ) {
 		t_smooth->check_toggle_state(x_auto, y_auto, z_auto);
 		t_linear->check_toggle_state(x_auto, y_auto, z_auto);
+		t_tangent->check_toggle_state(x_auto, y_auto, z_auto);
+		t_free->check_toggle_state(x_auto, y_auto, z_auto);
+		t_bump->check_toggle_state(x_auto, y_auto, z_auto);
 	}
 }
 
@@ -1205,9 +1331,41 @@ int CWindowCameraReset::handle_event()
 	return gui->press(&CWindowCanvas::reset_camera);
 }
 
+CWindowCurveAutoEdge::CWindowCurveAutoEdge(MWindow *mwindow,
+		CWindowToolGUI *gui, int x, int y)
+ : BC_Toggle(x, y, mwindow->theme->get_image_set("bump_edge"), gui->edge)
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Bump edit edge left/right"));
+}
+
+int CWindowCurveAutoEdge::handle_event()
+{
+	gui->edge = get_value();
+	gui->update();
+	return 1;
+}
+
+CWindowCurveAutoSpan::CWindowCurveAutoSpan(MWindow *mwindow,
+		CWindowToolGUI *gui, int x, int y)
+ : BC_Toggle(x, y, mwindow->theme->get_image_set("bump_span"), gui->span)
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Bump spans to next/prev"));
+}
+
+int CWindowCurveAutoSpan::handle_event()
+{
+	gui->span = get_value();
+	gui->update();
+	return 1;
+}
+
 
 CWindowProjectorGUI::CWindowProjectorGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Projector"), xS(170), yS(170))
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Projector"), xS(340), yS(170))
 {
 }
 CWindowProjectorGUI::~CWindowProjectorGUI()
@@ -1224,6 +1382,7 @@ void CWindowProjectorGUI::create_objects()
 	FloatAuto *z_auto = 0;
 	BC_Title *title;
 	BC_Button *button;
+	span = 1;  edge = 0;
 
 	lock_window("CWindowProjectorGUI::create_objects");
 	if( track ) {
@@ -1231,29 +1390,28 @@ void CWindowProjectorGUI::create_objects()
 			&x_auto, &y_auto, &z_auto, 0, 0, 0, 0);
 	}
 
-	add_subwindow(title = new BC_Title(x, y, "X:"));
-	x += title->get_w();
-	this->x = new CWindowCoord(this, x, y,
-		x_auto ? x_auto->get_value() : (float)0);
+	add_subwindow(title = new BC_Title(x = xs10, y, "X:"));
+	int x1 = x + title->get_w() + xS(3);
+	float xvalue = x_auto ? x_auto->get_value() : 0;
+	this->x = new CWindowCoord(this, x1, y, xvalue, AUTOMATION_PROJECTOR_X);
 	this->x->create_objects();
+	this->x->range->set_tooltip(_("expand X range"));
 	y += ys30;
-	x = xs10;
-	add_subwindow(title = new BC_Title(x, y, "Y:"));
-	x += title->get_w();
-	this->y = new CWindowCoord(this, x, y,
-		y_auto ? y_auto->get_value() : (float)0);
+	add_subwindow(title = new BC_Title(x = xs10, y, "Y:"));
+	float yvalue = y_auto ? y_auto->get_value() : 0;
+	this->y = new CWindowCoord(this, x1, y, yvalue, AUTOMATION_PROJECTOR_Y);
 	this->y->create_objects();
+	this->y->range->set_tooltip(_("expand Y range"));
 	y += ys30;
-	x = xs10;
-	add_subwindow(title = new BC_Title(x, y, "Z:"));
-	x += title->get_w();
-	this->z = new CWindowCoord(this, x, y,
-		z_auto ? z_auto->get_value() : (float)1);
+	add_subwindow(title = new BC_Title(x = xs10, y, "Z:"));
+	float zvalue = z_auto ? z_auto->get_value() : 1;
+	this->z = new CWindowCoord(this, x1, y, zvalue, AUTOMATION_PROJECTOR_Z);
 	this->z->create_objects();
+	this->z->range->set_tooltip(_("expand Zoom range"));
 	this->z->set_increment(0.01);
 
 	y += ys30;
-	int x1 = xs10;
+	x1 = xs10;
 	add_subwindow(button = new CWindowProjectorLeft(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowProjectorCenter(mwindow, this, x1, y));
@@ -1261,9 +1419,15 @@ void CWindowProjectorGUI::create_objects()
 	add_subwindow(button = new CWindowProjectorRight(mwindow, this, x1, y));
 // additional Buttons to control the curve mode of the "current" keyframe
 	x1 += button->get_w() + xs15;
-	add_subwindow(this->t_smooth = new CWindowCurveToggle(Projector_Crv_Smooth, mwindow, this, x1, y));
-	x1 += button->get_w() + xs10;
-	add_subwindow(this->t_linear = new CWindowCurveToggle(Projector_Crv_Linear, mwindow, this, x1, y));
+	add_subwindow(t_smooth = new CWindowCurveToggle(Projector_Crv_Smooth, mwindow, this, x1, y));
+	x1 += t_smooth->get_w() + xs10;
+	add_subwindow(t_linear = new CWindowCurveToggle(Projector_Crv_Linear, mwindow, this, x1, y));
+	x1 += t_linear->get_w() + xs15;
+	add_subwindow(t_tangent = new CWindowCurveToggle(Projector_Crv_Tangent, mwindow, this, x1, y));
+	x1 += t_tangent->get_w() + xs10;
+	add_subwindow(t_free = new CWindowCurveToggle(Projector_Crv_Free, mwindow, this, x1, y));
+	x1 += t_free->get_w() + xs10;
+	add_subwindow(t_bump = new CWindowCurveToggle(Projector_Crv_Bump, mwindow, this, x1, y));
 
 	y += button->get_h();
 	x1 = xs10;
@@ -1273,9 +1437,13 @@ void CWindowProjectorGUI::create_objects()
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowProjectorBottom(mwindow, this, x1, y));
 	x1 += button->get_w() + xs15;
-	add_subwindow(this->add_keyframe = new CWindowProjectorAddKeyframe(mwindow, this, x1, y));
-	x1 += button->get_w() + xs10;
-	add_subwindow(this->reset = new CWindowProjectorReset(mwindow, this, x1, y));
+	add_subwindow(add_keyframe = new CWindowProjectorAddKeyframe(mwindow, this, x1, y));
+	x1 += add_keyframe->get_w() + xs15;
+	add_subwindow(auto_span = new CWindowCurveAutoSpan(mwindow, this, x1, y));
+	x1 += auto_span->get_w() + xs10;
+	add_subwindow(auto_edge = new CWindowCurveAutoEdge(mwindow, this, x1, y));
+	x1 += auto_edge->get_w() + xs15;
+	add_subwindow(reset = new CWindowProjectorReset(mwindow, this, x1, y));
 
 // fill in current auto keyframe values, set toggle states.
 	this->update();
@@ -1284,61 +1452,16 @@ void CWindowProjectorGUI::create_objects()
 
 void CWindowProjectorGUI::handle_event()
 {
-	FloatAuto *x_auto = 0;
-	FloatAuto *y_auto = 0;
-	FloatAuto *z_auto = 0;
 	Track *track = mwindow->cwindow->calculate_affected_track();
-
-	if(track)
-	{
-		mwindow->undo->update_undo_before(_("projector"), this);
-		if(event_caller == x)
-		{
-			x_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_PROJECTOR_X], 1);
-			if(x_auto)
-			{
-				x_auto->set_value(atof(x->get_text()));
-				update();
-				update_preview();
-			}
-		}
-		else
-		if(event_caller == y)
-		{
-			y_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_PROJECTOR_Y], 1);
-			if(y_auto)
-			{
-				y_auto->set_value(atof(y->get_text()));
-				update();
-				update_preview();
-			}
-		}
-		else
-		if(event_caller == z)
-		{
-			z_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_PROJECTOR_Z], 1);
-			if(z_auto)
-			{
-				float zoom = atof(z->get_text());
-				if(zoom > 100.) zoom = 100.;
-				else if(zoom < 0.01) zoom = 0.01;
-// 			if (zoom != atof(z->get_text()))
-// 				z->update(zoom);
-				z_auto->set_value(zoom);
-
-				mwindow->gui->lock_window("CWindowProjectorGUI::handle_event");
-				mwindow->gui->draw_overlays(1);
-				mwindow->gui->unlock_window();
-
-				update();
-				update_preview();
-			}
-		}
-		mwindow->undo->update_undo_after(_("projector"), LOAD_ALL);
-	}
+	if( !track ) return;
+	mwindow->undo->update_undo_before(_("projector"), this);
+	if( event_caller == x )
+		update_auto(track, AUTOMATION_PROJECTOR_X, x);
+	else if( event_caller == y )
+		update_auto(track, AUTOMATION_PROJECTOR_Y, y);
+	else if( event_caller == z )
+		update_auto(track, AUTOMATION_PROJECTOR_Z, z);
+	mwindow->undo->update_undo_after(_("projector"), LOAD_ALL);
 }
 
 void CWindowProjectorGUI::update()
@@ -1347,27 +1470,44 @@ void CWindowProjectorGUI::update()
 	FloatAuto *y_auto = 0;
 	FloatAuto *z_auto = 0;
 	Track *track = mwindow->cwindow->calculate_affected_track();
+	int bg_color = get_resources()->text_background;
+	int hi_color = bg_color ^ 0x444444;
 	if( track ) {
 		mwindow->cwindow->calculate_affected_autos(track,
 			&x_auto, &y_auto, &z_auto, 0, 0, 0, 0);
 	}
 
-	if(x_auto)
-		x->update(x_auto->get_value());
-	if(y_auto)
-		y->update(y_auto->get_value());
-	if(z_auto) {
-		float value = z_auto->get_value();
-		z->update(value);
+	if( x_auto ) {
+		int color = (edge || span) && x_auto->curve_mode == FloatAuto::BUMP ?
+			hi_color : bg_color;
+		x->get_textbox()->set_back_color(color);
+		float xvalue = x_auto->get_value(edge);
+		x->update_gui(xvalue);
+	}
+	if( y_auto ) {
+		int color = (edge || span) && y_auto->curve_mode == FloatAuto::BUMP ?
+			hi_color : bg_color;
+		y->get_textbox()->set_back_color(color);
+		float yvalue = y_auto->get_value(edge);
+		y->update_gui(yvalue);
+	}
+	if( z_auto ) {
+		int color = (edge || span) && z_auto->curve_mode == FloatAuto::BUMP ?
+			hi_color : bg_color;
+		z->get_textbox()->set_back_color(color);
+		float zvalue = z_auto->get_value(edge);
+		z->update_gui(zvalue);
 		thread->gui->lock_window("CWindowProjectorGUI::update");
-		thread->gui->composite_panel->cpanel_zoom->update(value);
+		thread->gui->composite_panel->cpanel_zoom->update(zvalue);
 		thread->gui->unlock_window();
 	}
 
-	if( x_auto && y_auto && z_auto )
-	{
+	if( x_auto && y_auto && z_auto ) {
 		t_smooth->check_toggle_state(x_auto, y_auto, z_auto);
 		t_linear->check_toggle_state(x_auto, y_auto, z_auto);
+		t_tangent->check_toggle_state(x_auto, y_auto, z_auto);
+		t_free->check_toggle_state(x_auto, y_auto, z_auto);
+		t_bump->check_toggle_state(x_auto, y_auto, z_auto);
 	}
 }
 
@@ -1608,7 +1748,7 @@ int CWindowMaskOnTrack::handle_event()
 	if( k >= 0 ) {
 		track_item = (CWindowMaskItem *)track_items[k];
 		Track *track = track_item ? mwindow->edl->tracks->get_track_by_id(track_item->id) : 0;
-		if( track && track->record ) track_id = track->get_id();
+		if( track && track->is_armed() ) track_id = track->get_id();
 	}
 	else
 		track_id = mwindow->cwindow->mask_track_id;
@@ -1632,7 +1772,7 @@ void CWindowMaskOnTrack::update_items()
 	for( Track *track=mwindow->edl->tracks->first; track; track=track->next ) {
 		if( track->data_type != TRACK_VIDEO ) continue;
 		MaskAutos *mask_autos = (MaskAutos*)track->automation->autos[AUTOMATION_MASK];
-		int color = !track->record ? RED : mask_autos->first ?  high_color : -1;
+		int color = !track->is_armed() ? RED : mask_autos->first ?  high_color : -1;
 		MaskAuto *mask_auto = (MaskAuto*)mask_autos->default_auto;
 		for( int i=0; color<0 && i<mask_auto->masks.size(); ++i )
 			if( mask_auto->masks[i]->points.size() > 0 ) color = high_color;
@@ -1680,7 +1820,7 @@ int CWindowMaskTrackTumbler::do_event(int dir)
 			track_item = items[0];
 	}
 	Track *track = track_item ? mwindow->edl->tracks->get_track_by_id(track_item->id) : 0;
-	int track_id = track_item && track && track->record ? track_item->id : -1;
+	int track_id = track_item && track && track->is_armed() ? track_item->id : -1;
 	gui->mask_on_track->set_back_color(track_id >= 0 ?
 		gui->get_resources()->text_background :
 		gui->get_resources()->text_background_disarmed);
@@ -2889,7 +3029,7 @@ void CWindowMaskGUI::update()
 //printf("CWindowMaskGUI::update 1\n");
 	get_keyframe(track, autos, keyframe, mask, point, 0);
 	mwindow->cwindow->mask_track_id = track ? track->get_id() : -1;
-	mask_on_track->set_back_color(!track || track->record ?
+	mask_on_track->set_back_color(!track || track->is_armed() ?
 		get_resources()->text_background :
 		get_resources()->text_background_disarmed);
 	mask_on_track->update_items();