X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.C;h=f593b5803af6b586cb79e16289747889769d5112;hb=b30123c9534e8df8da1694d40396d86396bf1c08;hp=62aa0b282388ab8c71bab0164e09ff5d3ad5e024;hpb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index 62aa0b28..f593b580 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -642,7 +642,6 @@ int64_t TrackCanvas::drop_plugin_position(PluginSet *plugin_set, Plugin *moved_p
 	return -1;
 }
 
-
 void TrackCanvas::draw(int mode, int hide_cursor)
 {
 	const int debug = 0;
@@ -4571,9 +4570,15 @@ int TrackCanvas::do_tracks(int cursor_x, int cursor_y, int button_press)
 		int64_t track_x, track_y, track_w, track_h;
 		track_dimensions(track, track_x, track_y, track_w, track_h);
 
-		if(button_press && get_buttonpress() == RIGHT_BUTTON &&
-			cursor_y >= track_y && cursor_y < track_y + track_h) {
-			gui->edit_menu->update(track, 0);
+		if( button_press && get_buttonpress() == RIGHT_BUTTON &&
+		    cursor_y >= track_y && cursor_y < track_y + track_h) {
+			double pos = (double)cursor_x * mwindow->edl->local_session->zoom_sample /
+				mwindow->edl->session->sample_rate +
+				(double)mwindow->edl->local_session->view_start[pane->number] *
+					mwindow->edl->local_session->zoom_sample /
+					mwindow->edl->session->sample_rate;
+			int64_t position = track->to_units(pos, 0);
+			gui->edit_menu->update(track, track->edits->editof(position, PLAY_FORWARD, 0));
 			gui->edit_menu->activate_menu();
 			result = 1;
 		}
@@ -4836,12 +4841,7 @@ int TrackCanvas::button_press_event()
 	mwindow->session->trim_edits = 0;
 
 	if(is_event_win() && cursor_inside()) {
-//		double position = (double)cursor_x *
-//			mwindow->edl->local_session->zoom_sample /
-//			mwindow->edl->session->sample_rate +
-//			(double)mwindow->edl->local_session->view_start[pane->number] *
-//			mwindow->edl->local_session->zoom_sample /
-//			mwindow->edl->session->sample_rate;
+//		double position = mwindow->edl->get_cursor_position(cursor_x, pane->number);
 
 		result = 1;
 		if(!active) {
@@ -4921,12 +4921,7 @@ int TrackCanvas::button_press_event()
 
 // Test handles only and select a region
 			case EDITING_IBEAM: {
-				double position = (double)cursor_x *
-					mwindow->edl->local_session->zoom_sample /
-					mwindow->edl->session->sample_rate +
-					(double)mwindow->edl->local_session->view_start[pane->number] *
-					mwindow->edl->local_session->zoom_sample /
-					mwindow->edl->session->sample_rate;
+				double position = mwindow->edl->get_cursor_position(cursor_x, pane->number);
 //printf("TrackCanvas::button_press_event %d\n", position);
 
 				if( do_transitions(cursor_x, cursor_y,