X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=b38a563ecdcb63e5d9d8c0c901b4d6c9d0c32ec3;hb=7995a2d831a88199bfce4c7caa9d16b214f6781b;hp=efe891df50e5044a37bc399beefab5f4312c1a9e;hpb=c6016b2d08ac0fdda37ee6e1f59dadcfd4335388;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index efe891df..b38a563e 100644
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -903,17 +903,27 @@ void MWindow::match_output_size(Track *track)
 }
 
 
-void MWindow::selected_to_clipboard(int packed)
+EDL *MWindow::selected_edits_to_clip(int packed, double *start_position, Track **start_track)
 {
-	int64_t start = INT64_MAX, end = -INT64_MAX, pos = 0;
+	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;
-			if( start > (pos=edit->startproject) ) start = pos;
-			if( end < (pos+=edit->length) ) end = pos;
+			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);
@@ -925,35 +935,49 @@ void MWindow::selected_to_clipboard(int packed)
 	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 startproject = 0, last_startproject = start;
+		int64_t start_pos = track->to_units(start, 0);
+		int64_t end_pos = track->to_units(end, 0);
+		int64_t startproject = 0;
 		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
-			if( edit->startproject < start ) continue;
-			if( edit->startproject >= end ) break;
-			if( !edit->is_selected || edit->silence() ) {
-				if( !packed ) startproject += edit->length;
-	 			continue;
-			}
+			if( edit->startproject < start_pos ) continue;
+			if( edit->startproject >= end_pos ) break;
+			if( !edit->is_selected || edit->silence() ) continue;
 			if( !new_track )
 				new_track = new_edl->add_new_track(track->data_type);
 			if( new_track ) {
-				if( !packed && startproject > last_startproject ) {
-					Edit *silence = new Edit(new_edl, new_track);
-					silence->startproject = last_startproject;
-					silence->length = startproject - last_startproject;
-					new_track->edits->append(silence);
+				if( !packed ) {
+					int64_t edit_position = edit->startproject - start_pos;
+					if( edit_position > startproject ) {
+						Edit *silence = new Edit(new_edl, new_track);
+						silence->startproject = startproject;
+						silence->length = edit_position - startproject;
+						new_track->edits->append(silence);
+						startproject = edit_position;
+					}
 				}
 				Edit *clip_edit = new Edit(new_edl, new_track);
 				clip_edit->copy_from(edit);
 				clip_edit->startproject = startproject;
 				startproject += clip_edit->length;
-				last_startproject = startproject;
 				new_track->edits->append(clip_edit);
 			}
 		}
+		if( last_track == track ) break;
 	}
+	return new_edl;
+}
+
+void MWindow::selected_edits_to_clipboard(int packed)
+{
+	EDL *new_edl = MWindow::selected_edits_to_clip(packed);
+	if( !new_edl ) return;
 	double length = new_edl->tracks->total_length();
 	FileXML file;
 	new_edl->copy(0, length, 1, &file, "", 1);
@@ -1007,7 +1031,7 @@ void MWindow::delete_edits(int collapse)
 // packed - omit unselected from selection, unpacked - replace unselected with silence
 void MWindow::cut_selected_edits(int collapse, int packed)
 {
-	selected_to_clipboard(packed);
+	selected_edits_to_clipboard(packed);
 	ArrayList<Edit*> edits;
 	edl->tracks->get_selected_edits(&edits);
 	delete_edits(&edits, _("cut edit"), collapse);
@@ -1039,6 +1063,19 @@ void MWindow::move_edits(ArrayList<Edit*> *edits,
 	gui->update(1, NORMAL_DRAW, 1, 0, 0, 0, 0);
 }
 
+void MWindow::move_group(EDL *group, Track *first_track, double position, int overwrite)
+{
+	undo->update_undo_before();
+	edl->tracks->move_group(group, first_track, position, overwrite);
+	save_backup();
+	undo->update_undo_after(_("move group"), LOAD_ALL);
+	restart_brender();
+	cwindow->refresh_frame(CHANGE_EDL);
+
+	update_plugin_guis();
+	gui->update(1, NORMAL_DRAW, 1, 0, 0, 0, 0);
+}
+
 void MWindow::move_effect(Plugin *plugin, Track *track, int64_t position)
 {
 	undo->update_undo_before();