X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.C;h=771b88e7845b13b7405d0ec14a20369143567d9b;hp=27eede528e536bc2a324936ac4fb7d943a3dac89;hb=721a106de35567bcab14a0e92718767189acf176;hpb=61298e645e43da02c939e9512949f0b183542d58

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index 27eede52..771b88e7 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -880,6 +880,14 @@ void TrackCanvas::draw_resources(int mode,
 
 			}
 		}
+		int64_t track_x, track_y, track_w, track_h;
+		track_dimensions(current,
+			track_x, track_y, track_w, track_h);
+		set_color((~get_resources()->get_bg_color()) & 0xffffff);
+		set_opaque();
+		int x1 = track_x, x2 = x1+track_w;
+		int y1 = track_y+track_h-1;
+		draw_line(x1,y1, x2,y1, background_pixmap);
 	}
 
 
@@ -1888,6 +1896,8 @@ void TrackCanvas::refresh_plugintoggles()
 
 void TrackCanvas::draw_hard_edges()
 {
+	if( !mwindow->edl->session->auto_conf->hard_edges )
+		return;
 	int64_t x, y, w, h;
 
 	for(Track *track = mwindow->edl->tracks->first; track; track = track->next) {
@@ -2170,6 +2180,7 @@ int TrackCanvas::do_keyframes(int cursor_x,
 		pankeyframe_pixmap,
 		modekeyframe_pixmap,
 		maskkeyframe_pixmap,
+		0,
 	};
 
 
@@ -2468,12 +2479,23 @@ void TrackCanvas::draw_floatauto(FloatAuto *current,
 	CLAMP(y1, ymin, ymax);
 	CLAMP(y2, ymin, ymax);
 
-	if(y2 - 1 > y1)
-	{
-		set_color(BLACK);
-		draw_box(x1 + 1, y1 + 1, x2 - x1, y2 - y1);
-		set_color(color);
-		draw_box(x1, y1, x2 - x1, y2 - y1);
+	if( y2-1 > y1 ) {
+		if( current->curve_mode == FloatAuto::LINEAR ) {
+			draw_box(x1, y1, x2 - x1, y2 - y1);
+		}
+		else {
+			ArrayList<int> polygon_x;
+			ArrayList<int> polygon_y;
+			polygon_x.append((x1 + x2) / 2 + 1);
+			polygon_y.append(y1 + 1);
+			polygon_x.append(x2 + 1);
+			polygon_y.append((y1 + y2) / 2 + 1);
+			polygon_x.append((x1 + x2) / 2 + 1);
+			polygon_y.append(y2 + 1);
+			polygon_x.append(x1 + 1);
+			polygon_y.append((y1 + y2) / 2 + 1);
+			fill_polygon(&polygon_x, &polygon_y);
+		}
 	}
 
 // show bezier control points (only) if this
@@ -3651,16 +3673,20 @@ int TrackCanvas::draw_hairline(Auto *auto_keyframe, int color, int show)
 	set_color(color);
 	draw_line(ax, 0, ax, get_h());
 
+	char text[BCSTRLEN];
 	if( show ) {
-		char text[BCSTRLEN];
 		if( auto_keyframe->is_floatauto() ) {
 			FloatAuto *float_auto = (FloatAuto *)auto_keyframe;
 			sprintf(text, "%0.2f", float_auto->get_value());
 		}
-		else {
+		else if( auto_keyframe->is_intauto() ) {
 			IntAuto *int_auto = (IntAuto *)auto_keyframe;
 			sprintf(text, "%d", int_auto->value);
 		}
+		else
+			show = 0;
+	}
+	if( show ) {
 		int font = MEDIUMFONT;
 		int tw = get_text_width(font, text)  + TOOLTIP_MARGIN * 2;
 		int th = get_text_height(font, text) + TOOLTIP_MARGIN * 2;
@@ -3868,7 +3894,6 @@ int TrackCanvas::render_handle_frame(EDL *edl, int64_t pos, int mode)
 		delete video_cache;
 		mwindow->cwindow->gui->lock_window("TrackCanvas::render_handle_frame 0");
 		Canvas *canvas = mwindow->cwindow->gui->canvas;
-		canvas->lock_canvas("TrackCanvas::render_handle_frame 1");
 		int w = canvas->w, h = canvas->h, w2 = w/2, h2 = h/2;
 		int lx = 0, ly = h2/2, rx = w2, ry = h2/2;
 		BC_WindowBase *window = canvas->get_canvas();
@@ -3877,7 +3902,6 @@ int TrackCanvas::render_handle_frame(EDL *edl, int64_t pos, int mode)
 		window->draw_vframe(&vlt, lx,ly, w2,h2, 0,0,vlt.get_w(),vlt.get_h());
 		window->draw_vframe(&vrt, rx,ry, w2,h2, 0,0,vrt.get_w(),vrt.get_h());
 		window->flash(1);
-		canvas->unlock_canvas();
 		mwindow->cwindow->gui->unlock_window();
 		break; }
 	case 1:
@@ -4785,7 +4809,7 @@ int TrackCanvas::do_edit_handles(int cursor_x, int cursor_y, int button_press,
 			update_overlay = 1;
 		}
 	}
-	else if( result < 0 ) {
+	else if( result < 0 && !edit_result->silence() ) {
 		mwindow->undo->update_undo_before();
 		if( !shift_down() ) {
 			if( handle_result == 0 )
@@ -5025,11 +5049,8 @@ int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag
 							mwindow->session->drag_group->remove_user();
 						double start_position = 0;
 						mwindow->session->drag_group =
-							mwindow->selected_edits_to_clip(0, &start_position,
-								&mwindow->session->drag_group_first_track,
-								mwindow->edl->session->labels_follow_edits,
-								mwindow->edl->session->autos_follow_edits,
-								mwindow->edl->session->plugins_follow_edits);
+							mwindow->edl->selected_edits_to_clip(0, &start_position,
+								&mwindow->session->drag_group_first_track);
 						if( mwindow->session->drag_group ) {
 							mwindow->session->current_operation = DRAG_GROUP;
 							mwindow->session->drag_group_position = start_position;