projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build version update
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
commercials.C
diff --git
a/cinelerra-5.1/cinelerra/commercials.C
b/cinelerra-5.1/cinelerra/commercials.C
index a08ec02921e1e058c1d07c78470d23affe75a9c3..a81aafe8ee0357d295499fe10c5e97272d3fc96c 100644
(file)
--- 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;
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),
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 +
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;
{
this->sswindow = sswindow;
this->nlines = nlines;
@@
-787,8
+787,8
@@
stop()
if( running() ) {
if( gui ) gui->set_done(1);
cancel();
if( running() ) {
if( gui ) gui->set_done(1);
cancel();
- join();
}
}
+ join();
}
void ScanStatus::
}
void ScanStatus::
@@
-856,8
+856,8
@@
stop()
done = 1;
input_lock->unlock();
cancel();
done = 1;
input_lock->unlock();
cancel();
- join();
}
}
+ join();
if( commercials && !commercials->remove_user() )
commercials = 0;
}
if( commercials && !commercials->remove_user() )
commercials = 0;
}