X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcommercials.C;h=a81aafe8ee0357d295499fe10c5e97272d3fc96c;hb=38cb4182e11e57fc426bede3825e825e9d61433b;hp=2485f263fca69c0f7b96c91a36a74b02647bc1cf;hpb=3ec3a9cc6afc6561311686b3ec597ee3c1d80d6f;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/commercials.C b/cinelerra-5.1/cinelerra/commercials.C index 2485f263..a81aafe8 100644 --- a/cinelerra-5.1/cinelerra/commercials.C +++ b/cinelerra-5.1/cinelerra/commercials.C @@ -559,7 +559,7 @@ scan_audio(int vstream, double start, double end) Indexable *indexable = edit->get_source(); if( !indexable || !indexable->is_asset ) continue; Asset *asset = (Asset *)indexable; - if( !scan_file->asset->equivalent(*asset,0,0) ) continue; + if( !scan_file->asset->equivalent(*asset,0,0,mwindow->edl) ) continue; if( verify_edit(atrk, edit, start, end) ) continue; next = cut_edit(atrk, edit, atrk->to_units(start,0), @@ -701,7 +701,7 @@ ScanStatusGUI(ScanStatus *sswindow, int x, int y, int nlines, int nbars) 40 + BC_CancelButton::calculate_h() + (BC_Title::calculate_h((BC_WindowBase*) sswindow-> commercials->mwindow->gui, _("My")) + 5) * nlines + - (BC_ProgressBar::calculate_h() + 5) * nbars, 0, 0, 0) + (BC_ProgressBar::calculate_h() + 5) * nbars, 0, 0, 0) { this->sswindow = sswindow; this->nlines = nlines;