X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=168b7c9320245bde8d47445ac7ea860803e5712a;hb=48c313de28fe6d39d9431dbe2dca6ffb176541ff;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..168b7c93 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,30 +518,93 @@ 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();
+	if( EQUIV(start,end) )
+		blade(start);
+	else
+		cut(start, end);
+}
+
+void MWindow::blade(double position)
+{
+	undo->update_undo_before();
+	edl->blade(position);
+	edl->optimize();
+	save_backup();
+	undo->update_undo_after(_("blade"), LOAD_EDITS | LOAD_TIMEBAR);
+	restart_brender();
+	update_plugin_guis();
+	gui->update(1, 2, 1, 1, 1, 1, 0);
+	cwindow->update(1, 0, 0, 0, 1);
+	awindow->gui->async_update_assets();
+	cwindow->playback_engine->que->
+		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);
+}
 
+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);
 	cwindow->update(1, 0, 0, 0, 1);
+	awindow->gui->async_update_assets();
 	cwindow->playback_engine->que->
 		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 +889,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);
@@ -840,6 +914,8 @@ void MWindow::finish_modify_handles()
 	sync_parameters(CHANGE_EDL);
 	update_plugin_guis();
 	gui->update(1, 2, 1, 1, 1, 1, 0);
+// label list can be modified
+	awindow->gui->async_update_assets();
 	cwindow->update(1, 0, 0, 0, 1);
 }
 
@@ -1005,6 +1081,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);
 
@@ -1034,7 +1114,7 @@ void MWindow::overwrite(EDL *source)
 	}
 
 	source->copy(src_start, src_start + overwrite_len,
-		1, 0, 0, &file, "", 1);
+		0, 0, 0, &file, "", 1);
 
 // HACK around paste_edl get_start/endselection on its own
 // so we need to clear only when not using both io points
@@ -1066,7 +1146,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 +1169,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,
@@ -1272,7 +1352,7 @@ int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
 	if( !new_edls->total ) return 0;
 
 //PRINT_TRACE
-//	double original_length = edl->tracks->total_playable_length();
+//	double original_length = edl->tracks->total_length();
 //	double original_preview_end = edl->local_session->preview_end;
 //PRINT_TRACE
 
@@ -1286,6 +1366,7 @@ int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
 		edl = new EDL;
 		edl->create_objects();
 		edl->copy_session(new_edls->values[0]);
+		edl->copy_mixers(new_edls->values[0]);
 		gui->mainmenu->update_toggles(0);
 		gui->unlock_window();
 		gwindow->gui->update_toggles(1);
@@ -1547,7 +1628,7 @@ int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
 // Fix preview range
 //	if( EQUIV(original_length, original_preview_end) )
 //	{
-//		edl->local_session->preview_end = edl->tracks->total_playable_length();
+//		edl->local_session->preview_end = edl->tracks->total_length();
 //	}
 
 // Start examining next batch of index files
@@ -1567,6 +1648,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);
@@ -1849,6 +1932,7 @@ void MWindow::redo_entry(BC_WindowBase *calling_window_gui)
 	save_backup();
 	update_plugin_states();
 	update_plugin_guis();
+	awindow->gui->async_update_assets();
 	restart_brender();
 	gui->update(1, 2, 1, 1, 1, 1, 1);
 	cwindow->update(1, 1, 1, 1, 1);
@@ -2014,7 +2098,7 @@ void MWindow::save_clip(EDL *new_edl, const char *txt)
 
 	edl->update_assets(new_edl);
 	int cur_x, cur_y;
-	gui->get_abs_cursor_xy(cur_x, cur_y, 0);
+	gui->get_abs_cursor(cur_x, cur_y, 0);
 	gui->unlock_window();
 
 	awindow->clip_edit->create_clip(new_edl, cur_x, cur_y);
@@ -2103,12 +2187,17 @@ 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);
 	update_plugin_guis();
 	gui->update(1, 2, 1, 1, 1, 1, 0);
 	cwindow->update(1, 0, 0, 0, 1);
+	awindow->gui->async_update_assets();
 	restart_brender();
 	cwindow->playback_engine->que->
 		send_command(CURRENT_FRAME, CHANGE_EDL, edl, 1);