X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcommercials.C;h=3011e329024b4e43310849933bf71424530aad96;hb=02fe8e44992e30bdd98a1949506b54460c5f2f96;hp=a3461b6db942768b0c8218e330d5ab290cff1f14;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/commercials.C b/cinelerra-5.1/cinelerra/commercials.C index a3461b6d..3011e329 100644 --- a/cinelerra-5.1/cinelerra/commercials.C +++ b/cinelerra-5.1/cinelerra/commercials.C @@ -1,3 +1,22 @@ +/* + * CINELERRA + * Copyright (C) 2016-2020 William Morrow + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ #include "arraylist.h" #include "asset.h" @@ -551,7 +570,7 @@ scan_audio(int vstream, double start, double end) Tracks *tracks = mwindow->edl->tracks; for(Track *atrk=tracks->first; !cancelled && atrk; atrk=atrk->next) { if( atrk->data_type != TRACK_AUDIO ) continue; - if( !atrk->record ) continue; + if( !atrk->is_armed() ) continue; Edits *edits = atrk->edits; Edit *next = 0; for( Edit *edit=edits->first; !cancelled && edit; edit=next ) { next = edit->next; @@ -592,7 +611,7 @@ scan_video() Tracks *tracks = mwindow->edl->tracks; for( Track *vtrk=tracks->first; !cancelled && vtrk; vtrk=vtrk->next) { if( vtrk->data_type != TRACK_VIDEO ) continue; - if( !vtrk->record ) continue; + if( !vtrk->is_armed() ) continue; Edits *edits = vtrk->edits; Edit *next = 0; for( Edit *edit=edits->first; !cancelled && edit; edit=next ) { next = edit->next;