X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=f9f92900ff170c47d9001b384116e876fc21a2f8;hb=c5451a0a1f2a69ffea5e8b85d05787466f355481;hp=bf5dc9177388679677bf9b01de192ff7497221d7;hpb=a0ed17a5d6ecf2b010d977bc1f9b7226f24c20f6;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index bf5dc917..f9f92900 100644
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -403,10 +403,43 @@ void MWindow::clear_labels()
 
 int MWindow::clear_labels(double start, double end)
 {
+	if( start == end ) {
+		start = 0;
+		end = edl->tracks->total_length();
+	}
 	edl->labels->clear(start, end, 0);
 	return 0;
 }
 
+void MWindow::clear_hard_edges()
+{
+	undo_before();
+	clear_hard_edges(edl->local_session->get_selectionstart(),
+		edl->local_session->get_selectionend());
+	edl->optimize();
+	save_backup();
+	undo_after(_("clear hard edges"), LOAD_EDITS);
+	restart_brender();
+	gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
+	cwindow->refresh_frame(CHANGE_EDL);
+}
+
+int MWindow::clear_hard_edges(double start, double end)
+{
+	if( start == end ) {
+		start = 0;
+		end = edl->tracks->total_length();
+	}
+	edl->clear_hard_edges(start, end);
+	return 0;
+}
+
+void MWindow::clear_select()
+{
+	edl->tracks->clear_selected_edits();
+	gui->draw_overlays(1);
+}
+
 void MWindow::concatenate_tracks()
 {
 	undo_before();
@@ -646,12 +679,6 @@ int MWindow::cut_default_keyframe()
 }
 
 
-void MWindow::delete_track()
-{
-	if( edl->tracks->last )
-		delete_track(edl->tracks->last);
-}
-
 void MWindow::delete_tracks()
 {
 	undo_before();
@@ -1325,7 +1352,8 @@ void MWindow::load_assets(ArrayList<Indexable*> *new_assets,
 		load_mode = LOADMODE_ASSETSONLY;
 const int debug = 0;
 if( debug ) printf("MWindow::load_assets %d\n", __LINE__);
-	if( position < 0 ) position = edl->local_session->get_selectionstart();
+	if( position < 0 )
+		position = edl->local_session->get_selectionstart();
 
 	ArrayList<EDL*> new_edls;
 	for( int i=0; i<new_assets->total; ++i ) {
@@ -1491,6 +1519,9 @@ int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
 				default:
 					continue;
 				}
+// re-label only if not already labeled
+				if( new_edl->local_session->asset2edl )
+					strcpy(current->title, edl->tracks->last->title);
 				destination_tracks.append(edl->tracks->last);
 			}
 
@@ -1549,7 +1580,10 @@ int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
 		switch( load_mode ) {
 		case LOADMODE_REPLACE:
 			current_position = 0;
+			break;
 		case LOADMODE_NEW_TRACKS:
+			if( !overwrite )
+				current_position = 0;
 			break;
 
 		case LOADMODE_CONCATENATE:
@@ -1988,8 +2022,8 @@ void MWindow::redo_entry(BC_WindowBase *calling_window_gui)
 	gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 1);
 	gui->update_proxy_toggle();
 	gui->unlock_window();
-	cwindow->update(1, 1, 1, 1, 1);
 	cwindow->gui->unlock_window();
+	cwindow->update(1, 1, 1, 1, 1);
 
 	for( int i=0; i < vwindows.size(); ++i ) {
 		if( vwindows.get(i)->is_running() ) {
@@ -2263,8 +2297,8 @@ void MWindow::undo_entry(BC_WindowBase *calling_window_gui)
 	gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 1);
 	gui->update_proxy_toggle();
 	gui->unlock_window();
-	cwindow->update(1, 1, 1, 1, 1);
 	cwindow->gui->unlock_window();
+	cwindow->update(1, 1, 1, 1, 1);
 
 	for( int i=0; i<vwindows.size(); ++i ) {
 		if( vwindows.get(i)->is_running() ) {