}
}
// cut edit
- Edit *next_edit = track->edits->split_edit(edit, cut_start);
+ Edit *next_edit = edit->edits->split_edit(cut_start);
int64_t cut_length = cut_end - cut_start;
next_edit->length -= cut_length;
next_edit->startsource += cut_length;
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),
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;
if( running() ) {
if( gui ) gui->set_done(1);
cancel();
- join();
}
+ join();
}
void ScanStatus::
void SdbPacketQueue::
put_packet(SdbPacket *p)
{
- mLock holds(this);
+ lock("SdbPacketQueue::put_packet");
append(p);
+ unlock();
}
SdbPacket *SdbPacketQueue::
get_packet()
{
- mLock holds(this);
+ lock("SdbPacketQueue::get_packet");
SdbPacket *p = first;
remove_pointer(p);
+ unlock();
return p;
}
done = 1;
input_lock->unlock();
cancel();
- join();
}
+ join();
if( commercials && !commercials->remove_user() )
commercials = 0;
}