X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftracksedit.C;h=e84fe07b4b483ec94d09358e612a47cfb7362190;hb=81fc9cd689dd964a4736fa1f8986a64db6b4a937;hp=a3dfca741e4a69f784285087a934e65b2ead7e98;hpb=84ac8a2bb3357c04a3f67cf763b0f61ddbbd021d;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/tracksedit.C b/cinelerra-5.1/cinelerra/tracksedit.C
index a3dfca74..e84fe07b 100644
--- a/cinelerra-5.1/cinelerra/tracksedit.C
+++ b/cinelerra-5.1/cinelerra/tracksedit.C
@@ -386,7 +386,7 @@ void Tracks::set_transition_length(Transition *transition, double length)
 		}
 	}
 	if( !found ) return;
-	if( edl->session->gang_tracks == GANG_NONE ) return;
+	if( edl->local_session->gang_tracks == GANG_NONE ) return;
 	Track *track = transition->edit->track;
 	double pos = track->from_units(transition->edit->startproject);
 	Track *current = edl->tracks->first;
@@ -558,7 +558,7 @@ int Tracks::delete_tracks()
 {
 	int total_deleted = 0;
 	int done = 0;
-	int gang = edl->session->gang_tracks != GANG_NONE ? 1 : 0;
+	int gang = edl->local_session->gang_tracks != GANG_NONE ? 1 : 0;
 
 	while( !done ) {
 		done = 1;
@@ -757,7 +757,7 @@ int Tracks::concatenate_tracks(int edit_plugins, int edit_autos)
 			input_track = input_track->next)
 		{
 			if(input_track->data_type == data_type &&
-				input_track->play &&
+				input_track->plays() &&
 				!input_track->is_armed()) break;
 		}
 
@@ -783,7 +783,7 @@ int Tracks::concatenate_tracks(int edit_plugins, int edit_autos)
 
 					if(input_track->data_type == data_type &&
 						!input_track->is_armed() &&
-						input_track->play) break;
+						input_track->plays()) break;
 				}
 
 				for(output_track = output_track->next;
@@ -851,12 +851,12 @@ int Tracks::copy(int copy_flags, double start, double end,
 
 
 
-int Tracks::move_track_up(Track *track)
+int Tracks::roll_track_up(Track *track)
 {
 	if( first == last ) return 1;
 	int n = 1;
 	Track *src = track, *dst = src->previous;
-	if( edl->session->gang_tracks != GANG_NONE ) {
+	if( edl->local_session->gang_tracks != GANG_NONE ) {
 		while( src && !src->master ) src = src->previous;
 		if( !src ) src = first;
 		Track *nxt = src->next;
@@ -865,16 +865,16 @@ int Tracks::move_track_up(Track *track)
 		while( dst && !dst->master ) { dst = dst->previous; }
 	}
 	if( src == dst ) return 1;
-	move_tracks(src, dst, n);
+	roll_tracks(src, dst, n);
 	return 0;
 }
 
-int Tracks::move_track_down(Track *track)
+int Tracks::roll_track_down(Track *track)
 {
 	if( first == last ) return 1;
 	int n = 1;
 	Track *src = track, *dst = src->next;
-	if( edl->session->gang_tracks != GANG_NONE ) {
+	if( edl->local_session->gang_tracks != GANG_NONE ) {
 		while( src && !src->master ) src = src->previous;
 		if( !src ) src = first;
 		Track *nxt = src->next;
@@ -890,40 +890,40 @@ int Tracks::move_track_down(Track *track)
 	else
 		dst = !dst ? first : dst->next;
 	if( src == dst ) return 1;
-	move_tracks(src, dst, n);
+	roll_tracks(src, dst, n);
 	return 0;
 }
 
 
-int Tracks::move_tracks_up()
+int Tracks::roll_tracks_up()
 {
 	if( first == last ) return 1;
 	int n = 1;
 	Track *src = first, *dst = 0;
-	if( edl->session->gang_tracks != GANG_NONE ) {
+	if( edl->local_session->gang_tracks != GANG_NONE ) {
 		Track *nxt = src->next;
 		while( nxt && !nxt->master ) { ++n;  nxt = nxt->next; }
 	}
 	if( src == dst ) return 1;
-	move_tracks(src, dst, n);
+	roll_tracks(src, dst, n);
 	return 0;
 }
 
-int Tracks::move_tracks_down()
+int Tracks::roll_tracks_down()
 {
 	if( first == last ) return 1;
 	int n = 1;
 	Track *src = last, *dst = first;
-	if( edl->session->gang_tracks != GANG_NONE ) {
+	if( edl->local_session->gang_tracks != GANG_NONE ) {
 		while( src && !src->master ) { ++n;  src = src->previous; }
 	}
 	if( src == dst ) return 1;
-	move_tracks(src, dst, n);
+	roll_tracks(src, dst, n);
 	return 0;
 }
 
 
-int Tracks::swap_track_up(Track *track)
+int Tracks::move_track_up(Track *track)
 {
 	Track *next_track = track->previous;
 	if(!next_track) next_track = last;
@@ -933,7 +933,7 @@ int Tracks::swap_track_up(Track *track)
 	return 0;
 }
 
-int Tracks::swap_track_down(Track *track)
+int Tracks::move_track_down(Track *track)
 {
 	Track *next_track = track->next;
 	if(!next_track) next_track = first;
@@ -944,7 +944,7 @@ int Tracks::swap_track_down(Track *track)
 }
 
 
-int Tracks::swap_tracks_up()
+int Tracks::move_tracks_up()
 {
 	int result = 0;
 	Track *next = first;
@@ -961,7 +961,7 @@ int Tracks::swap_tracks_up()
 	return result;
 }
 
-int Tracks::swap_tracks_down()
+int Tracks::move_tracks_down()
 {
 	int result = 0;
 	Track *prev = last;
@@ -1108,7 +1108,7 @@ 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;
+	if( edl->local_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 ) {