X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.C;h=748b8b2b8878ec25ba5a769709e7d3effd2d408f;hb=a0ed17a5d6ecf2b010d977bc1f9b7226f24c20f6;hp=b9dd38841d4c7562a92849b52632ffcdd4457bbb;hpb=a64e7d16c44bba0d137936227fc55871bb26c903;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index b9dd3884..748b8b2b 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -5025,11 +5025,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;
@@ -5322,6 +5319,7 @@ int TrackCanvas::button_press_event()
 				if( do_keyframes(cursor_x, cursor_y,
 					0, get_buttonpress(), new_cursor,
 					update_cursor, rerender) ) break;
+				update_message = 1;
 // Test edit boundaries
 				if( do_edit_handles(cursor_x, cursor_y,
 					1, rerender, update_overlay, new_cursor,
@@ -5342,7 +5340,6 @@ int TrackCanvas::button_press_event()
 
 				if( do_tracks(cursor_x, cursor_y, 1) ) break;
 
-				update_message = 1;
 				result = 0;
 			} while(0);
 			else if( ibeam_mode() ) do {
@@ -5358,6 +5355,7 @@ int TrackCanvas::button_press_event()
 					update_overlay = 1;
 					break;
 				}
+				update_message = 1;
 // Test edit boundaries
 				if( do_edit_handles(cursor_x, cursor_y,
 					1, rerender, update_overlay, new_cursor, update_cursor) ) break;
@@ -5375,7 +5373,6 @@ int TrackCanvas::button_press_event()
 				if( get_buttonpress() != LEFT_BUTTON ) break;
 				rerender = start_selection(position);
 				mwindow->session->current_operation = SELECT_REGION;
-				update_message = 1;
 				update_cursor = 1;
 			} while(0);
 		}
@@ -5471,11 +5468,11 @@ double TrackCanvas::time_visible()
 }
 
 
-void TrackCanvas::show_message(Auto *current, int color, const char *fmt, ...)
+void TrackCanvas::show_message(Auto *current, int box_color, const char *fmt, ...)
 {
 	char string[BCTEXTLEN];
 	char *cp = string, *ep = cp + sizeof(string)-1;
-	if( color >= 0 ) {
+	if( box_color >= 0 ) {
 		cp += snprintf(string, ep-cp, "%-8s ",
 			FloatAuto::curve_name(((FloatAuto*)current)->curve_mode));
 	}
@@ -5491,7 +5488,7 @@ void TrackCanvas::show_message(Auto *current, int color, const char *fmt, ...)
 	va_start(ap, fmt);
 	vsnprintf(cp, ep-cp, fmt, ap);
 	va_end(ap);
-	gui->show_message(string, color);
+	gui->show_message(string, -1, box_color);
 }
 
 // Patchbay* TrackCanvas::get_patchbay()