add resource wdw folder expanders, fix plugin close deadlock detect

[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 a5bc6fea43f4f1de0d926348eb8853899ad724a5..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;
-                       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),
@@ -804,16 +804,18 @@ run()
 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;
 }