X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=d3e5218fec1bc1d39e6ad3c57cdebcbf3823195f;hp=17e74a90869d2df3c2f0faf95c12e71063ea8b8b;hb=da1e39d85e138b0d552e932d875c05e8dc743244;hpb=0c7b0aebb5e9f85f4eb7abb69b800d8d37b30b0f

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index 17e74a90..d3e5218f 100644
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -403,10 +403,37 @@ 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::concatenate_tracks()
 {
 	undo_before();
@@ -421,6 +448,17 @@ void MWindow::concatenate_tracks()
 }
 
 
+int MWindow::copy_flags(int copy_flags)
+{
+	if( !edl->session->labels_follow_edits )
+		copy_flags &= ~COPY_LABELS;
+	if( !edl->session->autos_follow_edits )
+		copy_flags &= ~COPY_AUTOS;
+	if( !edl->session->plugins_follow_edits )
+		copy_flags &= ~COPY_PLUGINS;
+	return copy_flags;
+}
+
 void MWindow::copy()
 {
 	copy(edl->local_session->get_selectionstart(),
@@ -432,7 +470,7 @@ int MWindow::copy(double start, double end)
 	if( start == end ) return 1;
 
 	FileXML file;
-	edl->copy(start, end, 0, &file, "", 1);
+	edl->copy(copy_flags(), start, end, &file, "", 1);
 	const char *file_string = file.string();
 	long file_length = strlen(file_string);
 	gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION);
@@ -635,12 +673,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();
@@ -862,6 +894,9 @@ void MWindow::finish_modify_handles()
 	double position = -1;
 	switch( edit_mode ) {
 	case MOVE_RIPPLE:
+		position = !session->drag_handle ?
+			session->drag_start : session->drag_position;
+		break;
 	case MOVE_ROLL:
 	case MOVE_SLIDE:
 		position = session->drag_position;
@@ -900,191 +935,6 @@ void MWindow::match_output_size(Track *track)
 }
 
 
-EDL *MWindow::selected_edits_to_clip(int packed,
-		double *start_position, Track **start_track,
-		int edit_labels, int edit_autos, int edit_plugins)
-{
-	double start = DBL_MAX, end = DBL_MIN;
-	Track *first_track=0, *last_track = 0;
-	for( Track *track=edl->tracks->first; track; track=track->next ) {
-		if( !track->record ) continue;
-		int empty = 1;
-		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
-			if( !edit->is_selected || edit->silence() ) continue;
-			double edit_pos = track->from_units(edit->startproject);
-			if( start > edit_pos ) start = edit_pos;
-			if( end < (edit_pos+=edit->length) ) end = edit_pos;
-			empty = 0;
-		}
-		if( empty ) continue;
-		if( !first_track ) first_track = track;
-		last_track = track;
-	}
-	if( start_position ) *start_position = start;
-	if( start_track ) *start_track = first_track;
-	if( !first_track ) return 0;
-	EDL *new_edl = new EDL();
-	new_edl->create_objects();
-	new_edl->copy_session(edl);
-	const char *text = _("new_edl edit");
-	new_edl->set_path(text);
-	strcpy(new_edl->local_session->clip_title, text);
-	strcpy(new_edl->local_session->clip_notes, text);
-	new_edl->session->video_tracks = 0;
-	new_edl->session->audio_tracks = 0;
-	for( Track *track=edl->tracks->first; track; track=track->next ) {
-		if( !track->record ) continue;
-		if( first_track ) {
-			if( first_track != track ) continue;
-			first_track = 0;
-		}
-		Track *new_track = 0;
-		if( !packed )
-			new_track = new_edl->add_new_track(track->data_type);
-		int64_t start_pos = track->to_units(start, 0);
-		int64_t end_pos = track->to_units(end, 0);
-		int64_t startproject = 0;
-		Edit *edit = track->edits->first;
-		for( ; edit; edit=edit->next ) {
-			if( !edit->is_selected || edit->silence() ) continue;
-			if( edit->startproject < start_pos ) continue;
-			if( edit->startproject >= end_pos ) break;
-			int64_t edit_start_pos = edit->startproject;
-			int64_t edit_end_pos = edit->startproject + edit->length;
-			if( !new_track )
-				new_track = new_edl->add_new_track(track->data_type);
-			int64_t edit_pos = edit_start_pos - start_pos;
-			if( !packed && edit_pos > startproject ) {
-				Edit *silence = new Edit(new_edl, new_track);
-				silence->startproject = startproject;
-				silence->length = edit_pos - startproject;
-				new_track->edits->append(silence);
-				startproject = edit_pos;
-			}
-			int64_t clip_start_pos = startproject;
-			Edit *clip_edit = new Edit(new_edl, new_track);
-			clip_edit->copy_from(edit);
-			clip_edit->startproject = startproject;
-			startproject += clip_edit->length;
-			new_track->edits->append(clip_edit);
-			if( edit_labels ) {
-				double edit_start = track->from_units(edit_start_pos);
-				double edit_end = track->from_units(edit_end_pos);
-				double clip_start = new_track->from_units(clip_start_pos);
-				Label *label = edl->labels->first;
-				for( ; label; label=label->next ) {
-					if( label->position < edit_start ) continue;
-					if( label->position >= edit_end ) break;
-					double clip_position = label->position - edit_start + clip_start;
-					Label *clip_label = new_edl->labels->first;
-					while( clip_label && clip_label->position<clip_position )
-						clip_label = clip_label->next;
-					if( clip_label && clip_label->position == clip_position ) continue;
-					Label *new_label = new Label(new_edl,
-						new_edl->labels, clip_position, label->textstr);
-					new_edl->labels->insert_before(clip_label, new_label);
-				}
-			}
-			if( edit_autos ) {
-				Automation *automation = track->automation;
-				Automation *new_automation = new_track->automation;
-				for( int i=0; i<AUTOMATION_TOTAL; ++i ) {
-					Autos *autos = automation->autos[i];
-					if( !autos ) continue;
-					Autos *new_autos = new_automation->autos[i];
-					new_autos->default_auto->copy_from(autos->default_auto);
-					Auto *aut0 = autos->first;
-					for( ; aut0; aut0=aut0->next ) {
-						if( aut0->position < edit_start_pos ) continue;
-						if( aut0->position >= edit_end_pos ) break;
-						Auto *new_auto = new_autos->new_auto();
-						new_auto->copy_from(aut0);
-						int64_t clip_position = aut0->position - edit_start_pos + clip_start_pos;
-						new_auto->position = clip_position;
-						new_autos->append(new_auto);
-					}
-				}
-			}
-			if( edit_plugins ) {
-				while( new_track->plugin_set.size() < track->plugin_set.size() )
-					new_track->plugin_set.append(0);
-				for( int i=0; i<track->plugin_set.total; ++i ) {
-					PluginSet *plugin_set = track->plugin_set[i];
-					if( !plugin_set ) continue;
-					PluginSet *new_plugin_set = new_track->plugin_set[i];
-					if( !new_plugin_set ) {
-						new_plugin_set = new PluginSet(new_edl, new_track);
-						new_track->plugin_set[i] = new_plugin_set;
-					}
-					Plugin *plugin = (Plugin*)plugin_set->first;
-					int64_t startplugin = new_plugin_set->length();
-					for( ; plugin ; plugin=(Plugin*)plugin->next ) {
-						if( plugin->silence() ) continue;
-						int64_t plugin_start_pos = plugin->startproject;
-						int64_t plugin_end_pos = plugin_start_pos + plugin->length;
-						if( plugin_end_pos < start_pos ) continue;
-						if( plugin_start_pos > end_pos ) break;
-						if( plugin_start_pos < edit_start_pos )
-							plugin_start_pos = edit_start_pos;
-						if( plugin_end_pos > edit_end_pos )
-							plugin_end_pos = edit_end_pos;
-						if( plugin_start_pos >= plugin_end_pos ) continue;
-						int64_t plugin_pos = plugin_start_pos - start_pos;
-						if( !packed && plugin_pos > startplugin ) {
-							Plugin *silence = new Plugin(new_edl, new_track, "");
-							silence->startproject = startplugin;
-							silence->length = plugin_pos - startplugin;
-							new_plugin_set->append(silence);
-							startplugin = plugin_pos;
-						}
-						Plugin *new_plugin = new Plugin(new_edl, new_track, plugin->title);
-						new_plugin->copy_base(plugin);
-						new_plugin->startproject = startplugin;
-						new_plugin->length = plugin_end_pos - plugin_start_pos;
-						startplugin += new_plugin->length;
-						new_plugin_set->append(new_plugin);
-						KeyFrames *keyframes = plugin->keyframes;
-						KeyFrames *new_keyframes = new_plugin->keyframes;
-						new_keyframes->default_auto->copy_from(keyframes->default_auto);
-						new_keyframes->default_auto->position = new_plugin->startproject;
-						KeyFrame *keyframe = (KeyFrame*)keyframes->first;
-						for( ; keyframe; keyframe=(KeyFrame*)keyframe->next ) {
-							if( keyframe->position < edit_start_pos ) continue;
-							if( keyframe->position >= edit_end_pos ) break;
-							KeyFrame *clip_keyframe = new KeyFrame(new_edl, new_keyframes);
-							clip_keyframe->copy_from(keyframe);
-							int64_t key_position = keyframe->position - start_pos;
-							if( packed )
-								key_position += new_plugin->startproject - plugin_pos;
-							clip_keyframe->position = key_position;
-							new_keyframes->append(clip_keyframe);
-						}
-					}
-				}
-			}
-		}
-		if( last_track == track ) break;
-	}
-	return new_edl;
-}
-
-void MWindow::selected_edits_to_clipboard(int packed)
-{
-	EDL *new_edl = selected_edits_to_clip(packed, 0, 0,
-		edl->session->labels_follow_edits,
-		edl->session->autos_follow_edits,
-		edl->session->plugins_follow_edits);
-	if( !new_edl ) return;
-	double length = new_edl->tracks->total_length();
-	FileXML file;
-	new_edl->copy(0, length, 1, &file, "", 1);
-	const char *file_string = file.string();
-	long file_length = strlen(file_string);
-	gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION);
-	gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION);
-	new_edl->remove_user();
-}
-
 void MWindow::delete_edit(Edit *edit, const char *msg, int collapse)
 {
 	ArrayList<Edit*> edits;
@@ -1151,131 +1001,20 @@ void MWindow::move_edits(ArrayList<Edit*> *edits,
 	gui->update(1, NORMAL_DRAW, 1, 0, 0, 0, 0);
 }
 
-void MWindow::paste_edits(EDL *clip, Track *first_track, double position, int overwrite,
-		int edit_edits, int edit_labels, int edit_autos, int edit_plugins)
+void MWindow::selected_edits_to_clipboard(int packed)
 {
-	if( !first_track )
-		first_track = edl->tracks->first;
-	Track *src = clip->tracks->first;
-	for( Track *track=first_track; track && src; track=track->next ) {
-		if( !track->record ) continue;
-		int64_t pos = track->to_units(position, 0);
-		if( edit_edits ) {
-			for( Edit *edit=src->edits->first; edit; edit=edit->next ) {
-				if( edit->silence() ) continue;
-				int64_t start = pos + edit->startproject;
-				int64_t len = edit->length, end = start + len;
-				if( overwrite )
-					track->edits->clear(start, end);
-				Edit *dst = track->edits->insert_new_edit(start);
-				dst->copy_from(edit);
-				dst->startproject = start;
-				dst->is_selected = 1;
-				while( (dst=dst->next) != 0 )
-					dst->startproject += edit->length;
-				if( overwrite ) continue;
-				if( edit_labels && track == first_track ) {
-					double dst_pos = track->from_units(start);
-					double dst_len = track->from_units(len);
-					for( Label *label=edl->labels->first; label; label=label->next ) {
-						if( label->position >= dst_pos )
-							label->position += dst_len;
-					}
-				}
-				if( edit_autos ) {
-					for( int i=0; i<AUTOMATION_TOTAL; ++i ) {
-						Autos *autos = track->automation->autos[i];
-						if( !autos ) continue;
-						for( Auto *aut0=autos->first; aut0; aut0=aut0->next ) {
-							if( aut0->position >= start )
-								aut0->position += edit->length;
-						}
-					}
-				}
-				if( edit_plugins ) {
-					for( int i=0; i<track->plugin_set.size(); ++i ) {
-						PluginSet *plugin_set = track->plugin_set[i];
-						Plugin *plugin = (Plugin *)plugin_set->first;
-						for( ; plugin; plugin=(Plugin *)plugin->next ) {
-							if( plugin->startproject >= start )
-								plugin->startproject += edit->length;
-							else if( plugin->startproject+plugin->length > end )
-								plugin->length += edit->length;
-							Auto *default_keyframe = plugin->keyframes->default_auto;
-							if( default_keyframe->position >= start )
-								default_keyframe->position += edit->length;
-							KeyFrame *keyframe = (KeyFrame*)plugin->keyframes->first;
-							for( ; keyframe; keyframe=(KeyFrame*)keyframe->next ) {
-								if( keyframe->position >= start )
-									keyframe->position += edit->length;
-							}
-						}
-						plugin_set->optimize();
-					}
-				}
-			}
-		}
-		if( edit_autos ) {
-			for( int i=0; i<AUTOMATION_TOTAL; ++i ) {
-				Autos *src_autos = src->automation->autos[i];
-				if( !src_autos ) continue;
-				Autos *autos = track->automation->autos[i];
-				for( Auto *aut0=src_autos->first; aut0; aut0=aut0->next ) {
-					int64_t auto_pos = pos + aut0->position;
-					autos->insert_auto(auto_pos, aut0);
-				}
-			}
-		}
-		if( edit_plugins ) {
-			for( int i=0; i<src->plugin_set.size(); ++i ) {
-				PluginSet *plugin_set = src->plugin_set[i];
-				if( !plugin_set ) continue;
-				while( i >= track->plugin_set.size() )
-					track->plugin_set.append(0);
-				PluginSet *dst_plugin_set = track->plugin_set[i];
-				if( !dst_plugin_set ) {
-					dst_plugin_set = new PluginSet(edl, track);
-					track->plugin_set[i] = dst_plugin_set;
-				}
-				Plugin *plugin = (Plugin *)plugin_set->first;
-				if( plugin ) track->expand_view = 1;
-				for( ; plugin; plugin=(Plugin *)plugin->next ) {
-					int64_t start = pos + plugin->startproject;
-					int64_t end = start + plugin->length;
-					if( overwrite || edit_edits )
-						dst_plugin_set->clear(start, end, 1);
-					Plugin *new_plugin = dst_plugin_set->insert_plugin(plugin->title,
-						start, end-start, plugin->plugin_type, &plugin->shared_location,
-						(KeyFrame*)plugin->keyframes->default_auto, 0);
-					KeyFrame *keyframe = (KeyFrame*)plugin->keyframes->first;
-					for( ; keyframe; keyframe=(KeyFrame*)keyframe->next ) {
-						int64_t keyframe_pos = pos + keyframe->position;
-						new_plugin->keyframes->insert_auto(keyframe_pos, keyframe);
-					}
-					while( (new_plugin=(Plugin *)new_plugin->next) ) {
-						KeyFrame *keyframe = (KeyFrame*)new_plugin->keyframes->first;
-						for( ; keyframe; keyframe=(KeyFrame*)keyframe->next )
-							keyframe->position += plugin->length;
-					}
-				}
-			}
-		}
-		src = src->next;
-	}
-	if( edit_labels ) {
-		Label *edl_label = edl->labels->first;
-		for( Label *label=clip->labels->first; label; label=label->next ) {
-			double label_pos = position + label->position;
-			int exists = 0;
-			while( edl_label &&
-				!(exists=edl->equivalent(edl_label->position, label_pos)) &&
-				edl_label->position < position ) edl_label = edl_label->next;
-			if( exists ) continue;
-			edl->labels->insert_before(edl_label,
-				new Label(edl, edl->labels, label_pos, label->textstr));
-		}
-	}
-	edl->optimize();
+	EDL *new_edl = edl->selected_edits_to_clip(packed, 0, 0,
+		edl->session->labels_follow_edits,
+		edl->session->autos_follow_edits,
+		edl->session->plugins_follow_edits);
+	if( !new_edl ) return;
+	FileXML file;
+	new_edl->copy(COPY_EDL, &file, "", 1);
+	const char *file_string = file.string();
+	long file_length = strlen(file_string);
+	gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION);
+	gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION);
+	new_edl->remove_user();
 }
 
 void MWindow::paste_clipboard(Track *first_track, double position, int overwrite,
@@ -1292,7 +1031,7 @@ void MWindow::paste_clipboard(Track *first_track, double position, int overwrite
 	clip->create_objects();
 	if( !clip->load_xml(&file, LOAD_ALL) ) {
 		undo_before();
-		paste_edits(clip, first_track, position, overwrite,
+		edl->paste_edits(clip, first_track, position, overwrite,
 			edit_edits, edit_labels, edit_autos, edit_plugins);
 		save_backup();
 		undo_after(_("paste clip"), LOAD_ALL);
@@ -1317,7 +1056,7 @@ void MWindow::move_group(EDL *group, Track *first_track, double position, int ov
 	if( edl->session->labels_follow_edits )
 		edl->delete_edit_labels(&edits, 0);
 	edl->delete_edits(&edits, 0);
-	paste_edits(group, first_track, position, overwrite, 1,
+	edl->paste_edits(group, first_track, position, overwrite, 1,
 		edl->session->labels_follow_edits,
 		edl->session->autos_follow_edits,
 		edl->session->plugins_follow_edits);
@@ -1487,7 +1226,7 @@ void MWindow::overwrite(EDL *source, int all)
 		overwrite_len = dst_len;
 	}
 
-	source->copy(src_start, src_start + overwrite_len, 0, &file, "", 1);
+	source->copy(copy_flags(), src_start, src_start + overwrite_len, &file, "", 1);
 
 // HACK around paste_edl get_start/endselection on its own
 // so we need to clear only when not using both io points
@@ -1607,7 +1346,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 ) {
@@ -1773,6 +1513,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);
 			}
 
@@ -1786,16 +1529,6 @@ int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
 	if( load_mode == LOADMODE_CONCATENATE ||
 	    load_mode == LOADMODE_PASTE ||
 	    load_mode == LOADMODE_NESTED ) {
-//PRINT_TRACE
-
-// The point of this is to shift forward labels after the selection so they can
-// then be shifted back to their original locations without recursively
-// shifting back every paste.
-		if( (load_mode == LOADMODE_PASTE || load_mode == LOADMODE_NESTED) &&
-		    edl->session->labels_follow_edits )
-			edl->labels->clear(edl->local_session->get_selectionstart(),
-					   edl->local_session->get_selectionend(), 1);
-
 		Track *current = first_track ? first_track : edl->tracks->first;
 		for( ; current; current=NEXT ) {
 			if( current->record ) {
@@ -1803,7 +1536,6 @@ int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
 			}
 		}
 //PRINT_TRACE
-
 	}
 //PRINT_TRACE
 	int destination_track = 0;
@@ -1841,9 +1573,12 @@ int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
 // Get starting point of insertion.  Need this to paste labels.
 		switch( load_mode ) {
 		case LOADMODE_REPLACE:
-		case LOADMODE_NEW_TRACKS:
 			current_position = 0;
 			break;
+		case LOADMODE_NEW_TRACKS:
+			if( !overwrite )
+				current_position = 0;
+			break;
 
 		case LOADMODE_CONCATENATE:
 		case LOADMODE_REPLACE_CONCATENATE:
@@ -1870,22 +1605,19 @@ int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
 			edl->add_clip(new_edl);
 			break;
 		}
-//PRINT_TRACE
 // Insert edl
 		if( load_mode != LOADMODE_RESOURCESONLY &&
 		    load_mode != LOADMODE_ASSETSONLY ) {
 // Insert labels
-			if( edl->session->labels_follow_edits ) {
-//printf("MWindow::paste_edls %f %f\n", current_position, edl_length);
+			if( edit_labels ) {
 				if( load_mode == LOADMODE_PASTE || load_mode == LOADMODE_NESTED )
 					edl->labels->insert_labels(new_edl->labels,
 						destination_tracks.total ? paste_position[0] : 0.0,
-						edl_length, edit_labels);
+						edl_length, 1);
 				else
 					edl->labels->insert_labels(new_edl->labels, current_position,
-						edl_length, edit_labels);
+						edl_length, 1);
 			}
-//PRINT_TRACE
 			double total_length = new_edl->tracks->total_length();
 			for( Track *new_track=new_edl->tracks->first;
 			     new_track; new_track=new_track->next ) {
@@ -2284,8 +2016,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() ) {
@@ -2371,7 +2103,7 @@ void MWindow::splice(EDL *source, int all)
 		src->outpoint_valid() ? src->get_outpoint() :
 		src->inpoint_valid() ? source->tracks->total_length() :
 			src->get_selectionend();
-	source->copy(source_start, source_end, 1, &file, "", 1);
+	source->copy(COPY_EDL, source_start, source_end, &file, "", 1);
 //file.dump();
 	double start = edl->local_session->get_selectionstart();
 	//double end = edl->local_session->get_selectionend();
@@ -2475,7 +2207,7 @@ void MWindow::to_clip(EDL *edl, const char *txt, int all)
 	}
 
 // Don't copy all since we don't want the clips twice.
-	edl->copy(start, end, 0, &file, "", 1);
+	edl->copy(copy_flags(), start, end, &file, "", 1);
 
 	EDL *new_edl = new EDL(edl);
 	new_edl->create_objects();
@@ -2559,8 +2291,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() ) {