X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedit.C;h=5fab82ea4fb6f9876b89e1bbb160fc3b4d4696ce;hp=f5a06bbf0dd54db600879661d7aa820acf93b6c6;hb=ddfda6a8cc59bda4dc734973c1c5fecaa31ea487;hpb=12d4e343f31707c899e6e4daa10c68b172433cff

diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C
index f5a06bbf..5fab82ea 100644
--- a/cinelerra-5.1/cinelerra/edit.C
+++ b/cinelerra-5.1/cinelerra/edit.C
@@ -85,7 +85,6 @@ void Edit::reset()
 	channel = 0;
 	user_title[0] = 0;
 	nested_edl = 0;
-	is_plugin = 0;
 	is_selected = 0;
 	hard_left = 0;
 	hard_right = 0;
@@ -235,8 +234,23 @@ void Edit::insert_transition(char *title)
 
 void Edit::detach_transition()
 {
-	if(transition) delete transition;
+	delete transition;
 	transition = 0;
+	if( edl->local_session->gang_tracks == GANG_NONE ) return;
+	double pos = track->from_units(startproject);
+	Track *current = edl->tracks->first;
+	for( ; current; current=current->next ) {
+		if( current == track ) continue;
+		if( current->data_type != track->data_type ) continue;
+		if( !current->armed_gang(track) ) continue;
+		int64_t track_pos = current->to_units(pos, 1);
+		Edit *edit = current->edits->editof(track_pos, PLAY_FORWARD, 0);
+		if( !edit ) continue;
+		double edit_pos = track->from_units(edit->startproject);
+		if( !edl->equivalent(pos, edit_pos) ) continue;
+		delete edit->transition;
+		edit->transition = 0;
+	}
 }
 
 int Edit::silence()
@@ -248,12 +262,36 @@ int Edit::silence()
 
 void Edit::set_selected(int v)
 {
-	if( group_id )
-		edl->tracks->set_group_selected(group_id, v);
+	if( !group_id ) {
+		if( v < 0 ) v = !is_selected ? 1 : 0;
+		int gang = edl->local_session->gang_tracks != GANG_NONE ? 1 : 0;
+		select_affected_edits(v, gang);
+	}
 	else
-		is_selected = v >= 0 ? v : !is_selected ? 1 : 0;
+		edl->tracks->set_group_selected(group_id, v);
+}
+
+// gang<0: rest of tracks, gang==0: this track, gang>0: to next master
+void Edit::select_affected_edits(int v, int gang)
+{
+	is_selected = v;
+	if( !gang ) return;
+	double position = track->from_units(startproject);
+	for( Track *current=track->next; current; current=current->next ) {
+		if( gang > 0 && current->master ) break;
+		if( !current->is_armed() ) continue;
+		for( Edit *edit=current->edits->first; edit; edit=edit->next ) {
+			if( edit->silence() ) continue;
+			double start = current->from_units(edit->startproject);
+			if( edl->equivalent(start, position) ) {
+				edit->is_selected = v;
+				break;
+			}
+		}
+	}
 }
 
+
 void Edit::copy_from(Edit *edit)
 {
 	this->orig_id = edit->orig_id;
@@ -279,6 +317,12 @@ void Edit::copy_from(Edit *edit)
 	this->channel = edit->channel;
 }
 
+void Edit::clone_from(Edit *edit)
+{
+	copy_from(edit);
+	edit->orig_id = edit->id;
+}
+
 void Edit::equivalent_output(Edit *edit, int64_t *result)
 {
 // End of edit changed
@@ -374,20 +418,20 @@ double Edit::picon_w()
 		w = nested_edl->session->output_w;
 		h = nested_edl->session->output_h;
 	}
-	return w>0 && h>0 ? ((double)edl->local_session->zoom_track*w)/h : 0;
+	return w>0 && h>0 ? ((double)track->data_h*w)/h : 0;
 }
 
 int Edit::picon_h()
 {
-	return edl->local_session->zoom_track;
+	return track->data_h;
 }
 
 
 int Edit::dump(FILE *fp)
 {
 	fprintf(fp,"     EDIT %p\n", this); fflush(fp);
-	fprintf(fp,"      nested_edl=%p %s asset=%p %s\n",
-		nested_edl, nested_edl ? nested_edl->path : "",
+	fprintf(fp,"      id %d, orig_id %d, nested_edl=%p %s asset=%p %s\n",
+		id, orig_id, nested_edl, nested_edl ? nested_edl->path : "",
 		asset, asset ? asset->path : "");
 	fflush(fp);
 	fprintf(fp,"      channel %d, color %08x, hard lt/rt %d/%d"