projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
repair cpanel zoom
[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 2485f263fca69c0f7b96c91a36a74b02647bc1cf..3a3de58615e59836ad0e5a830c1623644a3a33e5 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;
@@
-804,16
+804,18
@@
run()
void SdbPacketQueue::
put_packet(SdbPacket *p)
{
void SdbPacketQueue::
put_packet(SdbPacket *p)
{
-
mLock holds(this
);
+
lock("SdbPacketQueue::put_packet"
);
append(p);
append(p);
+ unlock();
}
SdbPacket *SdbPacketQueue::
get_packet()
{
}
SdbPacket *SdbPacketQueue::
get_packet()
{
-
mLock holds(this
);
+
lock("SdbPacketQueue::get_packet"
);
SdbPacket *p = first;
remove_pointer(p);
SdbPacket *p = first;
remove_pointer(p);
+ unlock();
return p;
}
return p;
}