X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=4e1c5c7415d76314da93fb85d398683a9327046f;hb=9d832a1fff11b11aaa1108c460690ed05e2bdc05;hp=9d1a9dfcca130969e55d69b7a0ed56ebc02e7c63;hpb=2f1bbd12877daf745e1d18b62b731f04cece827e;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index 9d1a9dfc..4e1c5c74 100644
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -301,7 +301,7 @@ void MWindow::asset_to_rate()
 void MWindow::clear_entry()
 {
 	undo->update_undo_before();
-	clear(1);
+	clear(1, 1);
 
 	edl->optimize();
 	save_backup();
@@ -315,7 +315,7 @@ void MWindow::clear_entry()
 		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
 }
 
-void MWindow::clear(int clear_handle)
+void MWindow::clear(int clear_handle, int deglitch)
 {
 	double start = edl->local_session->get_selectionstart();
 	double end = edl->local_session->get_selectionend();
@@ -326,6 +326,12 @@ void MWindow::clear(int clear_handle)
 			edl->session->plugins_follow_edits,
 			edl->session->autos_follow_edits);
 	}
+	
+// always needed by paste operations
+	if(deglitch)
+	{
+		edl->deglitch(start);
+	}
 }
 
 void MWindow::set_automation_mode(int mode)
@@ -512,22 +518,29 @@ void MWindow::crop_video()
 
 void MWindow::cut()
 {
-	undo->update_undo_before();
-
 	double start = edl->local_session->get_selectionstart();
 	double end = edl->local_session->get_selectionend();
+	cut(start, end);
+}
 
+void MWindow::cut(double start, double end, double new_position)
+{
+	undo->update_undo_before();
 	copy(start, end);
 	edl->clear(start, end,
 		edl->session->labels_follow_edits,
 		edl->session->plugins_follow_edits,
 		edl->session->autos_follow_edits);
+	edl->deglitch(start);
 
 
 	edl->optimize();
 	save_backup();
 	undo->update_undo_after(_("cut"), LOAD_EDITS | LOAD_TIMEBAR);
-
+	if( new_position >= 0 ) {
+		edl->local_session->set_selectionstart(new_position);
+		edl->local_session->set_selectionend(new_position);
+	}
 	restart_brender();
 	update_plugin_guis();
 	gui->update(1, 2, 1, 1, 1, 1, 0);
@@ -536,6 +549,42 @@ void MWindow::cut()
 		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
 }
 
+void MWindow::snap_left_edit()
+{
+	double start_pos = edl->local_session->get_selectionstart(1);
+	double position = edl->prev_edit(start_pos);
+	if( position < start_pos )
+		cut(position, start_pos, position);
+}
+
+void MWindow::snap_right_edit()
+{
+	double end_pos = edl->local_session->get_selectionend(1);
+	double position = edl->next_edit(end_pos);
+	if( end_pos < position )
+		cut(end_pos, position, end_pos);
+}
+
+void MWindow::snap_left_label()
+{
+	double start_pos = edl->local_session->get_selectionstart(1);
+	Label *left_label = edl->labels->prev_label(start_pos);
+	if( !left_label ) return;
+	double position = left_label->position;
+	if( position < start_pos )
+		cut(position, start_pos, position);
+}
+
+void MWindow::snap_right_label()
+{
+	double end_pos = edl->local_session->get_selectionend(1);
+	Label *right_label = edl->labels->next_label(end_pos);
+	if( !right_label ) return;
+	double position = right_label->position;
+	if( end_pos < position )
+		cut(end_pos, position, end_pos);
+}
+
 int MWindow::cut_automation()
 {
 	undo->update_undo_before();
@@ -820,15 +869,20 @@ void MWindow::finish_modify_handles()
 
 	if( (session->drag_handle == 1 && edit_mode != MOVE_NO_EDITS) ||
 		(session->drag_handle == 0 && edit_mode == MOVE_ONE_EDIT) ) {
+//printf("MWindow::finish_modify_handles %d\n", __LINE__);
 		edl->local_session->set_selectionstart(session->drag_position);
 		edl->local_session->set_selectionend(session->drag_position);
+		edl->deglitch(session->drag_position);
 	}
 	else
 	if( edit_mode != MOVE_NO_EDITS ) {
+//printf("MWindow::finish_modify_handles %d\n", __LINE__);
 		edl->local_session->set_selectionstart(session->drag_start);
 		edl->local_session->set_selectionend(session->drag_start);
+		edl->deglitch(session->drag_start);
 	}
 
+// clamp the selection to 0
 	if( edl->local_session->get_selectionstart(1) < 0 ) {
 		edl->local_session->set_selectionstart(0);
 		edl->local_session->set_selectionend(0);
@@ -1005,6 +1059,10 @@ void MWindow::mute_selection()
 		edl->paste_silence(start, end, 0,
 			edl->session->plugins_follow_edits,
 			edl->session->autos_follow_edits);
+		edl->deglitch(start);
+		edl->deglitch(end);
+
+		
 		save_backup();
 		undo->update_undo_after(_("mute"), LOAD_EDITS);
 
@@ -1066,7 +1124,7 @@ int MWindow::paste(double start,
 	int edit_plugins,
 	int edit_autos)
 {
-	clear(0);
+	clear(0, 1);
 
 // Want to insert with assets shared with the master EDL.
 	insert(start, file,
@@ -1089,7 +1147,7 @@ void MWindow::paste()
 		gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
 		FileXML file;
 		file.read_from_string(string);
-		clear(0);
+		clear(0, 1);
 
 		insert(start, &file,
 			edl->session->labels_follow_edits,
@@ -1567,6 +1625,8 @@ void MWindow::paste_silence()
 		edl->session->labels_follow_edits,
 		edl->session->plugins_follow_edits,
 		edl->session->autos_follow_edits);
+	edl->deglitch(start);
+	edl->deglitch(end);
 	edl->optimize();
 	save_backup();
 	undo->update_undo_after(_("silence"), LOAD_EDITS | LOAD_TIMEBAR);
@@ -2103,6 +2163,10 @@ void MWindow::trim_selection()
 		edl->session->labels_follow_edits,
 		edl->session->plugins_follow_edits,
 		edl->session->autos_follow_edits);
+	edl->deglitch(0);
+	edl->deglitch(edl->local_session->get_selectionend() -
+		edl->local_session->get_selectionstart());
+	
 
 	save_backup();
 	undo->update_undo_after(_("trim selection"), LOAD_EDITS | LOAD_TIMEBAR);