X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcommercials.C;h=3a3de58615e59836ad0e5a830c1623644a3a33e5;hb=ae44cc4a24c9e04ee5e3b38baf6ce529832cfb39;hp=a5bc6fea43f4f1de0d926348eb8853899ad724a5;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/commercials.C b/cinelerra-5.1/cinelerra/commercials.C
index a5bc6fea..3a3de586 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),
@@ -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;
 }