X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftracks.C;h=7feb1f99cfc1febeec05653ee8843c244ec52f1f;hb=c5451a0a1f2a69ffea5e8b85d05787466f355481;hp=b70b2b8a5543d4b6ca451081710e3b8c4b8fb358;hpb=9a7a880b549aed850fd3c29abb152d69a94e23f8;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/tracks.C b/cinelerra-5.1/cinelerra/tracks.C index b70b2b8a..7feb1f99 100644 --- a/cinelerra-5.1/cinelerra/tracks.C +++ b/cinelerra-5.1/cinelerra/tracks.C @@ -118,6 +118,7 @@ void Tracks::select_affected_edits(double position, Track *start_track, int sens for( Track *track=start_track; track; track=track->next ) { if( !track->record ) continue; for( Edit *edit=track->edits->first; edit; edit=edit->next ) { + if( edit->silence() ) continue; double startproject = track->from_units(edit->startproject); if( edl->equivalent(startproject, position) ) { edit->is_selected = sense >= 0 ? sense : @@ -169,6 +170,8 @@ void Tracks::copy_from(Tracks *tracks) Track *new_track = 0; delete_all_tracks(); + int solo_track_id = tracks->edl->local_session->solo_track_id; + for(Track *current = tracks->first; current; current = NEXT) { switch(current->data_type) @@ -186,6 +189,9 @@ void Tracks::copy_from(Tracks *tracks) continue; } new_track->copy_from(current); + + if( current->get_id() == solo_track_id ) + edl->local_session->solo_track_id = new_track->get_id(); } } @@ -624,6 +630,12 @@ Track* Tracks::number(int number) return current; } +Track* Tracks::get_track_by_id(int id) +{ + Track *track = edl->tracks->first; + while( track && track->get_id() != id ) track = track->next; + return track; +} int Tracks::total_playable_vtracks() { @@ -659,6 +671,7 @@ int Tracks::new_group(int id) for( Track *track=first; track; track=track->next ) { if( !track->record ) continue; for( Edit *edit=track->edits->first; edit; edit=edit->next ) { + if( edit->group_id > 0 ) continue; if( !edit->is_selected ) continue; edit->group_id = id; ++count;