X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftracksedit.C;fp=cinelerra-5.1%2Fcinelerra%2Ftracksedit.C;h=e84fe07b4b483ec94d09358e612a47cfb7362190;hp=8a8602f6090f8032b150d42b8cb001a757ab28c2;hb=b384d47608e07b9f5b6ce5fe1d0d76d9bda38202;hpb=81915b8dd7046fd88697e3a9cc1a11b891be62db diff --git a/cinelerra-5.1/cinelerra/tracksedit.C b/cinelerra-5.1/cinelerra/tracksedit.C index 8a8602f6..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; @@ -856,7 +856,7 @@ 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; @@ -874,7 +874,7 @@ 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; @@ -900,7 +900,7 @@ 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; } } @@ -914,7 +914,7 @@ 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; @@ -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 ) {