X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftracksedit.C;h=f1684204d4fdb8d9f74296e7e41c000825b3789c;hp=d97800ce9a750458f694fde3d8bef4fa304eda2f;hb=9a75aafbc51be29b49351a51e9084bb34d255c0d;hpb=9a7a880b549aed850fd3c29abb152d69a94e23f8

diff --git a/cinelerra-5.1/cinelerra/tracksedit.C b/cinelerra-5.1/cinelerra/tracksedit.C
index d97800ce..f1684204 100644
--- a/cinelerra-5.1/cinelerra/tracksedit.C
+++ b/cinelerra-5.1/cinelerra/tracksedit.C
@@ -50,7 +50,7 @@
 int Tracks::blade(double position)
 {
 	for( Track *track=first; track!=0; track=track->next ) {
-		if( !track->record ) continue;
+		if( !track->is_armed() ) continue;
 		track->blade(position);
 	}
 	return 0;
@@ -64,7 +64,7 @@ int Tracks::clear(double start, double end, int clear_plugins, int edit_autos)
 		current_track;
 		current_track = current_track->next)
 	{
-		if(current_track->record)
+		if(current_track->is_armed())
 		{
 			current_track->clear(start,
 				end,
@@ -72,7 +72,6 @@ int Tracks::clear(double start, double end, int clear_plugins, int edit_autos)
 				1, // labels
 				clear_plugins, // edit_plugins
 				edit_autos,
-				1, // convert_units
 				0); // trim_edits
 		}
 	}
@@ -85,7 +84,7 @@ void Tracks::clear_automation(double selectionstart, double selectionend)
 
 	for(current_track = first; current_track; current_track = current_track->next)
 	{
-		if(current_track->record)
+		if(current_track->is_armed())
 		{
 			current_track->clear_automation(selectionstart,
 				selectionend,
@@ -101,7 +100,7 @@ void Tracks::clear_transitions(double start, double end)
 		current_track;
 		current_track = current_track->next)
 	{
-		if(current_track->record)
+		if(current_track->is_armed())
 		{
 			int64_t start_units = current_track->to_units(start, 0);
 			int64_t end_units = current_track->to_units(end, 0);
@@ -121,6 +120,33 @@ void Tracks::clear_transitions(double start, double end)
 	}
 }
 
+int Tracks::clear_hard_edges(double start, double end)
+{
+	for( Track *track=first; track; track=track->next ) {
+		if( !track->is_armed() ) continue;
+		int64_t start_units = track->to_units(start, 0);
+		int64_t end_units = track->to_units(end, 0);
+
+		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+			int64_t pos = edit->startproject;
+			if( pos > end_units ) break;
+			if( pos >= start_units ) {
+				edit->hard_left = 0;
+				if( edit->previous )
+					edit->previous->hard_right = 0;
+			}
+			pos += edit->length;
+			if( pos > end_units ) break;
+			if( pos >= start_units ) {
+				edit->hard_right = 0;
+				if( edit->next )
+					edit->next->hard_left = 0;
+			}
+		}
+	}
+	return 0;
+}
+
 void Tracks::shuffle_edits(double start, double end)
 {
 // This doesn't affect automation or effects
@@ -130,7 +156,7 @@ void Tracks::shuffle_edits(double start, double end)
 		current_track;
 		current_track = current_track->next)
 	{
-		if(current_track->record)
+		if(current_track->is_armed())
 		{
 			current_track->shuffle_edits(start, end, first_track);
 
@@ -148,7 +174,7 @@ void Tracks::reverse_edits(double start, double end)
 		current_track;
 		current_track = current_track->next)
 	{
-		if(current_track->record)
+		if(current_track->is_armed())
 		{
 			current_track->reverse_edits(start, end, first_track);
 
@@ -156,19 +182,17 @@ void Tracks::reverse_edits(double start, double end)
 		}
 	}
 }
+
 void Tracks::align_edits(double start, double end)
 {
 // This doesn't affect automation or effects
-	ArrayList<double> times;
-
-	for(Track *current_track = first;
-		current_track;
-		current_track = current_track->next)
-	{
-		if(current_track->record)
-		{
-			current_track->align_edits(start, end, &times);
-		}
+	Track *master_track = 0;
+	for( Track *track=first; track; track=track->next ) {
+		if( !track->is_armed() ) continue;
+		if( !master_track )
+			master_track = track;
+		else
+			track->align_edits(start, end, master_track);
 	}
 }
 
@@ -179,7 +203,7 @@ void Tracks::set_edit_length(double start, double end, double length)
 		current_track;
 		current_track = current_track->next)
 	{
-		if(current_track->record)
+		if(current_track->is_armed())
 		{
 #define USE_FLOATING_LENGTHS
 
@@ -215,28 +239,13 @@ void Tracks::set_edit_length(double start, double end, double length)
 // Go in using the edit handle interface
 					int64_t starting_length = current_edit->length;
 
-					if(length_units < current_edit->length)
-					{
-						current_edit->shift_end_in(MOVE_ALL_EDITS,
-							current_edit->startproject + length_units,
-							current_edit->startproject + current_edit->length,
-							1,
-							edl->session->labels_follow_edits,
-							edl->session->plugins_follow_edits,
-							edl->session->autos_follow_edits,
-							0);
-					}
-					else
-					{
-						current_edit->shift_end_out(MOVE_ALL_EDITS,
-							current_edit->startproject + length_units,
-							current_edit->startproject + current_edit->length,
-							1,
-							edl->session->labels_follow_edits,
-							edl->session->plugins_follow_edits,
-							edl->session->autos_follow_edits,
-							0);
-					}
+					current_edit->shift_end(MOVE_RIPPLE,
+						current_edit->startproject + length_units,
+						current_edit->startproject + current_edit->length,
+						0,
+						edl->session->autos_follow_edits,
+						edl->session->plugins_follow_edits,
+						0);
 
 					int64_t ending_length = current_edit->length;
 
@@ -249,8 +258,6 @@ void Tracks::set_edit_length(double start, double end, double length)
 						 edl->labels->modify_handles(
 							current_track->from_units(current_edit->startproject + starting_length),
 							current_track->from_units(current_edit->startproject + ending_length),
-							1,
-							MOVE_ALL_EDITS,
 							1);
 					}
 
@@ -299,42 +306,23 @@ void Tracks::set_edit_length(double start, double end, double length)
 // Go in using the edit handle interface
 					int64_t starting_length = current_edit->length;
 
-					if(length_units < current_edit->length)
-					{
-						current_edit->shift_end_in(MOVE_ALL_EDITS,
-							current_edit->startproject + length_units,
-							current_edit->startproject + current_edit->length,
-							1,
-							edl->session->labels_follow_edits,
-							edl->session->plugins_follow_edits,
-							edl->session->autos_follow_edits,
-							0);
-					}
-					else
-					{
-						current_edit->shift_end_out(MOVE_ALL_EDITS,
-							current_edit->startproject + length_units,
-							current_edit->startproject + current_edit->length,
-							1,
-							edl->session->labels_follow_edits,
-							edl->session->plugins_follow_edits,
-							edl->session->autos_follow_edits,
-							0);
-					}
+					current_edit->shift_end(MOVE_RIPPLE,
+						current_edit->startproject + length_units,
+						current_edit->startproject + current_edit->length,
+						0,
+						edl->session->autos_follow_edits,
+						edl->session->plugins_follow_edits,
+						0);
 
 					int64_t ending_length = current_edit->length;
 
-					if(edl->session->labels_follow_edits && first_track)
-					{
-// printf("Tracks::set_edit_length %d %f %f\n",
-// __LINE__,
+					if(edl->session->labels_follow_edits && first_track) {
+// printf("Tracks::set_edit_length %d %f %f\n", __LINE__,
 // current_track->from_units(current_edit->startproject + starting_length),
 // current_track->from_units(current_edit->startproject + ending_length));
 						 edl->labels->modify_handles(
 							current_track->from_units(current_edit->startproject + starting_length),
 							current_track->from_units(current_edit->startproject + ending_length),
-							1,
-							MOVE_ALL_EDITS,
 							1);
 					}
 
@@ -356,7 +344,7 @@ void Tracks::set_transition_length(double start, double end, double length)
 		current_track;
 		current_track = current_track->next)
 	{
-		if(current_track->record)
+		if(current_track->is_armed())
 		{
 			int64_t start_units = current_track->to_units(start, 0);
 			int64_t end_units = current_track->to_units(end, 0);
@@ -384,34 +372,48 @@ void Tracks::set_transition_length(double start, double end, double length)
 void Tracks::set_transition_length(Transition *transition, double length)
 {
 // Must verify existence of transition
-	int done = 0;
-	if(!transition) return;
-	for(Track *current_track = first;
-		current_track && !done;
-		current_track = current_track->next)
-	{
-		for(Edit *current_edit = current_track->edits->first;
-			current_edit && !done;
-			current_edit = current_edit->next)
-		{
-			if(current_edit->transition == transition)
-			{
-				transition->length = current_track->to_units(length, 1);
-				if( current_edit == current_track->edits->last &&
-				    current_edit->silence() ) {
-					current_edit->length = current_edit->transition->length;
+	int found = 0;
+	if( !transition ) return;
+	for( Track *track=first; track && !found; track=track->next ) {
+		for( Edit *edit=track->edits->first; edit && !found; edit = edit->next ) {
+			if( edit->transition == transition ) {
+				transition->length = track->to_units(length, 1);
+				if( edit == track->edits->last && edit->silence() ) {
+					edit->length = edit->transition->length;
 				}
-				done = 1;
+				found = 1;
 			}
 		}
 	}
+	if( !found ) return;
+	if( edl->session->gang_tracks == GANG_NONE ) return;
+	Track *track = transition->edit->track;
+	double pos = track->from_units(transition->edit->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 || !edit->transition ) continue;
+		double edit_pos = track->from_units(edit->startproject);
+		if( !edl->equivalent(pos, edit_pos) ) continue;
+// modify gang same transitions at same position
+		if( edit->transition->Plugin::identical(transition) ) {
+			edit->transition->length = transition->length;
+		}
+		if( edit == track->edits->last && edit->silence() ) {
+			edit->length = edit->transition->length;
+		}
+	}
 }
 
 void Tracks::paste_transitions(double start, double end, int track_type, char* title)
 {
 	int count = 0;
 	for( Track *track=first; track; track=track->next ) {
-		if( !track->record || track->data_type != track_type ) continue;
+		if( !track->is_armed() || track->data_type != track_type ) continue;
 		for( Edit *edit=track->edits->first;  edit; edit=edit->next ) {
 			if( !edit->is_selected ) continue;
 			edit->insert_transition(title);
@@ -424,7 +426,7 @@ void Tracks::paste_transitions(double start, double end, int track_type, char* t
 	}
 
 	for( Track *track=first; track; track=track->next ) {
-		if( !track->record || track->data_type != track_type ) continue;
+		if( !track->is_armed() || track->data_type != track_type ) continue;
 		int64_t start_units = track->to_units(start, 0);
 		int64_t end_units = track->to_units(end, 0);
 		if( start_units == end_units ) {
@@ -462,7 +464,7 @@ void Tracks::set_automation_mode(double selectionstart,
 
 	for(current_track = first; current_track; current_track = current_track->next)
 	{
-		if(current_track->record)
+		if(current_track->is_armed())
 		{
 			current_track->set_automation_mode(selectionstart,
 				selectionend,
@@ -475,7 +477,7 @@ int Tracks::clear_default_keyframe()
 {
 	for(Track *current = first; current; current = NEXT)
 	{
-		if(current->record)
+		if(current->is_armed())
 			current->clear_automation(0, 0, 0, 1);
 	}
 	return 0;
@@ -493,7 +495,7 @@ int Tracks::clear_handle(double start,
 
 	for(current_track = first; current_track; current_track = current_track->next)
 	{
-		if(current_track->record)
+		if(current_track->is_armed())
 		{
 			current_track->clear_handle(start,
 				end,
@@ -529,7 +531,7 @@ int Tracks::copy_automation(double selectionstart,
 		current_track;
 		current_track = current_track->next)
 	{
-		if(current_track->record)
+		if(current_track->is_armed())
 		{
 			current_track->copy_automation(selectionstart,
 				selectionend,
@@ -556,222 +558,131 @@ int Tracks::delete_tracks()
 {
 	int total_deleted = 0;
 	int done = 0;
+	int gang = edl->session->gang_tracks != GANG_NONE ? 1 : 0;
 
-	while(!done)
-	{
+	while( !done ) {
 		done = 1;
-		Track *next_track = 0;
-		for (Track* current = first; current && done; current = next_track)
-		{
-			next_track = current->next;
-			if(current->record)
-			{
-				delete_track(current);
-				current = NULL;
-				total_deleted++;
-				done = 0;
-				break;
+		for( Track* track=first, *nxt=0; done && track; track=nxt ) {
+			nxt = track->next;
+			if( gang ) {
+				while( nxt && !nxt->master ) nxt = nxt->next;
 			}
+			if( !track->is_armed() ) continue;
+			delete_track(track);
+			++total_deleted;
 		}
 	}
 	return total_deleted;
 }
 
-void Tracks::move_edits(ArrayList<Edit*> *edits,
-	Track *track,
-	double position,
-	int edit_labels,  // Ignored
-	int edit_plugins,  // Ignored
-	int edit_autos, // Ignored
-	int behaviour)
+void Tracks::move_edits(ArrayList<Edit*> *in_edits, Track *track, double position,
+	int edit_labels, int edit_plugins, int edit_autos, int mode)
 {
+// have to make a copy, optimize kills edits
+	ArrayList<Edit*> edits;
+	for( int i=0; i<in_edits->size(); ++i ) {
+		Edit *edit = in_edits->get(i);
+		Edit *new_edit = new Edit(edit->edl, edit->track);
+		new_edit->copy_from(edit);
+		edits.append(new_edit);
+	}
+
+	int current_aedit = 0, current_vedit = 0;
 //printf("Tracks::move_edits 1\n");
-	for(Track *dest_track = track; dest_track; dest_track = dest_track->next)
-	{
-		if(dest_track->record)
-		{
+	for( Track *dest_track=track; dest_track; dest_track=dest_track->next ) {
+		if( !dest_track->is_armed() ) continue;
 // Need a local copy of the source edit since the original source edit may
 // change in the editing operation.
-			Edit *source_edit = 0;
-			Track *source_track = 0;
-
-
-// Get source track
-			if(dest_track->data_type == TRACK_AUDIO)
-			{
-				int current_aedit = 0;
-
-				while(current_aedit < edits->total &&
-					edits->values[current_aedit]->track->data_type != TRACK_AUDIO)
-					current_aedit++;
-
-				if(current_aedit < edits->total)
-				{
-					source_edit = edits->values[current_aedit];
-					source_track = source_edit->track;
-					edits->remove_number(current_aedit);
-				}
-			}
-			else
-			if(dest_track->data_type == TRACK_VIDEO)
-			{
-				int current_vedit = 0;
-				while(current_vedit < edits->total &&
-					edits->values[current_vedit]->track->data_type != TRACK_VIDEO)
-					current_vedit++;
-
-				if(current_vedit < edits->total)
-				{
-					source_edit = edits->values[current_vedit];
-					source_track = source_edit->track;
-					edits->remove_number(current_vedit);
+// Get source edit
+		Edit *source_edit = 0;
+		Track *clip_track = 0;
+		switch( dest_track->data_type ) {
+		case TRACK_AUDIO: {
+			while( current_aedit < edits.size() ) {
+				Edit *edit = edits[current_aedit++];
+				if( edit->track->data_type == TRACK_AUDIO ) {
+					source_edit = edit;
+					ATrack *atrack = new ATrack(dest_track->edl, 0);
+					atrack->create_objects();
+					clip_track = atrack;
+					break;
 				}
 			}
-
-//printf("Tracks::move_edits 2 %s %s %d\n", source_track->title, dest_track->title, source_edit->length);
-			if(source_edit)
-			{
-				int64_t position_i = source_track->to_units(position, 0);
-// Source edit changes
-				int64_t source_length = source_edit->length;
-				int64_t source_startproject = source_edit->startproject;
-
-				if (behaviour == 0)
-				{
-				// This works like this: CUT edit, INSERT edit at final position, keyframes also follow
-				// FIXME: there should be a GUI way to tell whenever user also wants to move autos or not
-// this is all screwed up
-//  inserts defaults/bogus everywhere
-#if 0
-// Copy keyframes
-					FileXML temp;
-					AutoConf temp_autoconf;
-
-					temp_autoconf.set_all(1);
-
-					source_track->automation->copy(source_edit->startproject,
-						source_edit->startproject + source_edit->length,
-						&temp,
-						0,
-						0);
-					temp.terminate_string();
-					temp.rewind();
-// Insert new keyframes
-//printf("Tracks::move_edits 2 %d %p\n", result->startproject, result->asset);
-					source_track->automation->clear(source_edit->startproject,
-						source_edit->startproject + source_edit->length,
-						&temp_autoconf,
-						1);
-					int64_t position_a = position_i;
-					if (dest_track == source_track)
-					{
-						if (position_a > source_edit->startproject)
-							position_a -= source_length;
-					}
-
-					dest_track->automation->paste_silence(position_a,
-						position_a + source_length);
-					while(!temp.read_tag())
-						dest_track->automation->paste(position_a,
-							source_length, 1.0, &temp, 0, 1,
-							&temp_autoconf);
-#endif
-// Insert new edit
-					Edit *dest_edit = dest_track->edits->shift(position_i,
-						source_length);
-					Edit *result = dest_track->edits->insert_before(dest_edit,
-						dest_track->edits->create_edit());
-					result->copy_from(source_edit);
-					result->startproject = position_i;
-					result->length = source_length;
-
-// Clear source
-					source_track->edits->clear(source_edit->startproject,
-						source_edit->startproject + source_length);
-
-	/*
-//this is outline for future thinking how it is supposed to be done trough C&P mechanisms
-					temp.reset_tag();
-					source_track->cut(source_edit->startproject,
-						source_edit->startproject + source_edit->length,
-						&temp,
-						NULL);
-					temp.terminate_string();
-					temp.rewind();
-					dest_track->paste_silence(position_a,
-						position_a + source_length,
-						edit_plugins);
-					while(!temp.read_tag())
-						dest_track->paste(position_a,          // MISSING PIECE OF FUNCTIONALITY
-							source_length,
-							1.0,
-							&temp,
-							0,
-							&temp_autoconf);
-	*/
-
-
-				} else
-				if (behaviour == 1)
-				// ONLY edit is moved, all other edits stay where they are
-				{
-					// Copy edit to temp, delete the edit, insert the edit
-					Edit *temp_edit = dest_track->edits->create_edit();
-					temp_edit->copy_from(source_edit);
-					// we call the edits directly since we do not want to move keyframes or anything else
-					source_track->edits->clear(source_startproject,
-						source_startproject + source_length);
-					source_track->edits->paste_silence(source_startproject,
-						source_startproject + source_length);
-
-					dest_track->edits->clear(position_i,
-						position_i + source_length);
-					Edit *dest_edit = dest_track->edits->shift(position_i,  source_length);
-					Edit *result = dest_track->edits->insert_before(dest_edit,
-						dest_track->edits->create_edit());
-					result->copy_from(temp_edit);
-					result->startproject = position_i;
-					result->length = source_length;
-					delete temp_edit;
+			break; }
+		case TRACK_VIDEO: {
+			while( current_vedit < edits.size() ) {
+				Edit *edit = edits[current_vedit++];
+				if( edit->track->data_type == TRACK_VIDEO ) {
+					source_edit = edit;
+					VTrack *vtrack = new VTrack(dest_track->edl, 0);
+					vtrack->create_objects();
+					clip_track = vtrack;
+					break;
 				}
-				source_track->optimize();
-				dest_track->optimize();
 			}
+			break; }
+		}
+		if( !source_edit ) continue;
+
+		Track *source_track = source_edit->track;
+		int64_t start = source_edit->startproject;
+		int64_t length = source_edit->length, end = start + length;
+		double source_start = source_track->from_units(start);
+		double source_end = source_track->from_units(start+length);
+		double len = source_end - source_start;
+		double dest_start = position;
+		double dest_end = dest_start + len;
+
+		if( edit_labels && dest_track == track ) {
+			FileXML label_xml;
+			Labels labels(0, "LABELS");
+			source_edit->edl->labels->copy(source_start, source_end, &label_xml);
+			source_edit->edl->labels->clear(source_start, source_end, mode);
+			if( !label_xml.read_tag() )
+				labels.load(&label_xml, LOAD_ALL);
+			double pos = dest_start;
+			if( mode && source_start < dest_start ) pos -= len;
+			edl->labels->insert_labels(&labels, pos, len, mode);
+			edit_labels = 0;
 		}
-	}
-}
 
-void Tracks::move_group(EDL *group, Track *first_track, double position, int overwrite)
-{
-	for( Track *track=first; track; track=track->next ) {
-		if( !track->record ) continue;
-		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
-			if( !edit->is_selected ) continue;
-			edit->mute();
-			edit->is_selected = 0;
-			edit->group_id = 0;
+		FileXML track_xml;
+		source_track->copy(COPY_TRACKS, source_start, source_end, &track_xml, "");
+		if( !track_xml.read_tag() )
+			clip_track->load(&track_xml, 0, LOAD_ALL);
+
+		if( !mode ) { // mute and overwrite
+			source_track->clear(start, end, 1, 0,
+				edit_plugins, edit_autos, 0);
+			source_track->edits->paste_silence(start, end);
+			if( edit_autos )
+				source_track->shift_keyframes(start, length);
+			if( edit_plugins ) {
+				int n = source_track->plugin_set.size();
+				if( n > 0 ) dest_track->expand_view = 1;
+				for( int k=0; k<n; ++k )
+					source_track->plugin_set[k]->paste_silence(start, end, 1);
+			}
+			dest_track->clear(dest_start, dest_end, 1, 0,
+				edit_plugins, edit_autos, 0);
+			dest_track->insert_track(clip_track, dest_start, 0,
+				edit_plugins, edit_autos, len);
 		}
-	}
-	Track *src = group->tracks->first;
-	for( Track *track=first_track; track && src; track=track->next ) {
-		if( !track->record ) continue;
-		int64_t pos = track->to_units(position, 0);
-		for( Edit *edit=src->edits->first; edit; edit=edit->next ) {
-			if( edit->silence() ) continue;
-			int64_t start = pos + edit->startproject;
-			int64_t end = start + edit->length;
-			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;
+		else { // cut and paste
+			dest_track->insert_track(clip_track, dest_start, 0,
+				edit_plugins, edit_autos, len);
+			if( source_track == dest_track && dest_start < source_start ) {
+				source_start += len;   source_end += len;
+			}
+			source_track->clear(source_start, source_end, 1, 0,
+				edit_plugins, edit_autos, 0);
 		}
-		track->optimize();
-		src = src->next;
+
+		delete clip_track;
+		dest_track->optimize();
 	}
+
+	edits.remove_all_objects();
 }
 
 void Tracks::move_effect(Plugin *plugin, Track *track, int64_t position)
@@ -835,7 +746,7 @@ int Tracks::concatenate_tracks(int edit_plugins, int edit_autos)
 			output_track;
 			output_track = output_track->next)
 			if(output_track->data_type == data_type &&
-				output_track->record) break;
+				output_track->is_armed()) break;
 
 		first_output_track = output_track;
 
@@ -846,7 +757,7 @@ int Tracks::concatenate_tracks(int edit_plugins, int edit_autos)
 		{
 			if(input_track->data_type == data_type &&
 				input_track->play &&
-				!input_track->record) break;
+				!input_track->is_armed()) break;
 		}
 
 
@@ -870,7 +781,7 @@ int Tracks::concatenate_tracks(int edit_plugins, int edit_autos)
 				{
 
 					if(input_track->data_type == data_type &&
-						!input_track->record &&
+						!input_track->is_armed() &&
 						input_track->play) break;
 				}
 
@@ -879,7 +790,7 @@ int Tracks::concatenate_tracks(int edit_plugins, int edit_autos)
 					output_track = output_track->next)
 				{
 					if(output_track->data_type == data_type &&
-						output_track->record) break;
+						output_track->is_armed()) break;
 				}
 
 				if(!output_track)
@@ -924,27 +835,16 @@ void Tracks::change_plugins(SharedLocation &old_location, SharedLocation &new_lo
 // =========================================== EDL editing
 
 
-int Tracks::copy(double start,
-	double end,
-	int all,
-	FileXML *file,
-	const char *output_path)
+int Tracks::copy(int copy_flags, double start, double end,
+		FileXML *file, const char *output_path)
 {
-// nothing selected
-	if(start == end && !all) return 1;
-
-	Track* current;
-
-	for(current = first;
-		current;
-		current = NEXT)
-	{
-		if(current->record || all)
-		{
-			current->copy(start, end, file,output_path);
-		}
+	int all = (copy_flags & COPY_ALL) ? 1 : 0;
+// if nothing selected
+	if( start == end && !all ) return 1;
+	for( Track *track=first; track; track=track->next ) {
+		if( track->is_armed() || all )
+			track->copy(copy_flags, start, end, file, output_path);
 	}
-
 	return 0;
 }
 
@@ -952,98 +852,82 @@ int Tracks::copy(double start,
 
 int Tracks::move_track_up(Track *track)
 {
-	Track *next_track = track->previous;
-	if(!next_track) next_track = last;
-
-	change_modules(number_of(track), number_of(next_track), 1);
-
-// printf("Tracks::move_track_up 1 %p %p\n", track, next_track);
-// int count = 0;
-// for(Track *current = first; current && count < 5; current = NEXT, count++)
-// 	printf("Tracks::move_track_up %p %p %p\n", current->previous, current, current->next);
-// printf("Tracks::move_track_up 2\n");
-//
-	swap(track, next_track);
-
-// count = 0;
-// for(Track *current = first; current && count < 5; current = NEXT, count++)
-// 	printf("Tracks::move_track_up %p %p %p\n", current->previous, current, current->next);
-// printf("Tracks::move_track_up 3\n");
-
+	if( first == last ) return 1;
+	int n = 1;
+	Track *src = track, *dst = src->previous;
+	if( edl->session->gang_tracks != GANG_NONE ) {
+		while( src && !src->master ) src = src->previous;
+		if( !src ) src = first;
+		Track *nxt = src->next;
+		while( nxt && !nxt->master ) { ++n;  nxt = nxt->next; }
+		dst = src->previous;
+		while( dst && !dst->master ) { dst = dst->previous; }
+	}
+	if( src == dst ) return 1;
+	move_tracks(src, dst, n);
 	return 0;
 }
 
 int Tracks::move_track_down(Track *track)
 {
-	Track *next_track = track->next;
-	if(!next_track) next_track = first;
-
-	change_modules(number_of(track), number_of(next_track), 1);
-	swap(track, next_track);
+	if( first == last ) return 1;
+	int n = 1;
+	Track *src = track, *dst = src->next;
+	if( edl->session->gang_tracks != GANG_NONE ) {
+		while( src && !src->master ) src = src->previous;
+		if( !src ) src = first;
+		Track *nxt = src->next;
+		while( nxt && !nxt->master ) { ++n;  nxt = nxt->next; }
+		if( nxt ) {
+			nxt = nxt->next;
+			while( nxt && !nxt->master ) { nxt = nxt->next; }
+		}
+		else
+			nxt = first;
+		dst = nxt;
+	}
+	else
+		dst = !dst ? first : dst->next;
+	if( src == dst ) return 1;
+	move_tracks(src, dst, n);
 	return 0;
 }
 
 
 int Tracks::move_tracks_up()
 {
-	Track *track, *next_track;
-	int result = 0;
-
-	for(track = first;
-		track;
-		track = next_track)
-	{
-		next_track = track->next;
-
-		if(track->record)
-		{
-			if(track->previous)
-			{
-				change_modules(number_of(track->previous), number_of(track), 1);
-
-				swap(track->previous, track);
-				result = 1;
-			}
-		}
+	if( first == last ) return 1;
+	int n = 1;
+	Track *src = first, *dst = 0;
+	if( edl->session->gang_tracks != GANG_NONE ) {
+		Track *nxt = src->next;
+		while( nxt && !nxt->master ) { ++n;  nxt = nxt->next; }
 	}
-
-	return result;
+	if( src == dst ) return 1;
+	move_tracks(src, dst, n);
+	return 0;
 }
 
 int Tracks::move_tracks_down()
 {
-	Track *track, *previous_track;
-	int result = 0;
-
-	for(track = last;
-		track;
-		track = previous_track)
-	{
-		previous_track = track->previous;
-
-		if(track->record)
-		{
-			if(track->next)
-			{
-				change_modules(number_of(track), number_of(track->next), 1);
-
-				swap(track, track->next);
-				result = 1;
-			}
-		}
+	if( first == last ) return 1;
+	int n = 1;
+	Track *src = last, *dst = first;
+	if( edl->session->gang_tracks != GANG_NONE ) {
+		while( src && !src->master ) { ++n;  src = src->previous; }
 	}
-
-	return result;
+	if( src == dst ) return 1;
+	move_tracks(src, dst, n);
+	return 0;
 }
 
 
-
 void Tracks::paste_audio_transition(PluginServer *server)
 {
 	for(Track *current = first; current; current = NEXT)
 	{
 		if(current->data_type == TRACK_AUDIO &&
-			current->record)
+			current->is_armed())
 		{
 			int64_t position = current->to_units(
 				edl->local_session->get_selectionstart(), 0);
@@ -1121,7 +1005,7 @@ void Tracks::paste_automation(double selectionstart,
 					if(typeless)
 					{
 						if(!current_track) current_track = first;
-						while(current_track && !current_track->record)
+						while(current_track && !current_track->is_armed())
 							current_track = current_track->next;
 						dst_track = current_track;
 					}
@@ -1136,7 +1020,7 @@ void Tracks::paste_automation(double selectionstart,
 
 						while(current_atrack &&
 							(current_atrack->data_type != TRACK_AUDIO ||
-							!current_atrack->record))
+							!current_atrack->is_armed()))
 							current_atrack = current_atrack->next;
 						dst_track = current_atrack;
 					}
@@ -1150,7 +1034,7 @@ void Tracks::paste_automation(double selectionstart,
 
 						while(current_vtrack &&
 							(current_vtrack->data_type != TRACK_VIDEO ||
-							!current_vtrack->record))
+							!current_vtrack->is_armed()))
 							current_vtrack = current_vtrack->next;
 
 						dst_track = current_vtrack;
@@ -1190,6 +1074,20 @@ void Tracks::paste_automation(double selectionstart,
 void Tracks::paste_transition(PluginServer *server, Edit *dest_edit)
 {
 	dest_edit->insert_transition(server->title);
+	if( edl->session->gang_tracks == GANG_NONE ) return;
+	Track *track = dest_edit->track;
+	double pos = track->from_units(dest_edit->startproject);
+	for( Track *current=first; 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;
+		edit->insert_transition(server->title);
+	}
 }
 
 void Tracks::paste_video_transition(PluginServer *server, int first_track)
@@ -1197,7 +1095,7 @@ void Tracks::paste_video_transition(PluginServer *server, int first_track)
 	for(Track *current = first; current; current = NEXT)
 	{
 		if(current->data_type == TRACK_VIDEO &&
-			current->record)
+			current->is_armed())
 		{
 			int64_t position = current->to_units(
 				edl->local_session->get_selectionstart(), 0);
@@ -1230,7 +1128,7 @@ int Tracks::paste_silence(double start,
 		current_track;
 		current_track = current_track->next)
 	{
-		if(current_track->record)
+		if(current_track->is_armed())
 		{
 			current_track->paste_silence(start,
 				end,
@@ -1261,60 +1159,35 @@ int Tracks::move_auto(int cursor_x, int cursor_y, int shift_down)
 	return 0;
 }
 
-int Tracks::modify_edithandles(double &oldposition,
-	double &newposition,
-	int currentend,
-	int handle_mode,
-	int edit_labels,
-	int edit_plugins,
-	int edit_autos)
+int Tracks::modify_edithandles(double &oldposition, double &newposition,
+	int currentend, int handle_mode, int edit_labels,
+	int edit_plugins, int edit_autos, int group_id)
 {
-	Track *current;
-
-	for(current = first; current; current = NEXT)
-	{
-		if(current->record)
-		{
-			current->modify_edithandles(oldposition,
-				newposition,
-				currentend,
-				handle_mode,
-				edit_labels,
-				edit_plugins,
-				edit_autos);
-		}
+	for( Track *track=first; track; track=track->next ) {
+		if( !track->is_armed() ) continue;
+		track->modify_edithandles(oldposition, newposition,
+			currentend, handle_mode, edit_labels,
+			edit_plugins, edit_autos, group_id);
+// labels follow first armed track
+		edit_labels = 0;
 	}
 	return 0;
 }
 
-int Tracks::modify_pluginhandles(double &oldposition,
-	double &newposition,
-	int currentend,
-	int handle_mode,
-	int edit_labels,
-	int edit_autos,
-	Edits *trim_edits)
+int Tracks::modify_pluginhandles(double &oldposition, double &newposition,
+	int currentend, int handle_mode, int edit_labels,
+	int edit_autos, Edits *trim_edits)
 {
-	Track *current;
-
-	for(current = first; current; current = NEXT)
-	{
-		if(current->record)
-		{
-			current->modify_pluginhandles(oldposition,
-				newposition,
-				currentend,
-				handle_mode,
-				edit_labels,
-				edit_autos,
-				trim_edits);
-		}
+	for( Track *track=first; track; track=track->next ) {
+		if( !track->is_armed() ) continue;
+		track->modify_pluginhandles(oldposition, newposition,
+			currentend, handle_mode, edit_labels,
+			edit_autos, trim_edits);
 	}
 	return 0;
 }
 
 
-
 int Tracks::purge_asset(Asset *asset)
 {
 	Track *current_track;
@@ -1347,7 +1220,7 @@ int Tracks::scale_time(float rate_scale, int ignore_record, int scale_edits, int
 		current_track;
 		current_track = current_track->next)
 	{
-		if((current_track->record || ignore_record) &&
+		if((current_track->is_armed() || ignore_record) &&
 			current_track->data_type == TRACK_VIDEO)
 		{
 			current_track->scale_time(rate_scale, scale_edits, scale_autos, start, end);