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

diff --git a/cinelerra-5.1/cinelerra/commercials.C b/cinelerra-5.1/cinelerra/commercials.C
index a08ec029..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),
@@ -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 +
-		(BC_ProgressBar::calculate_h() + 5) * nbars, 0, 0, 0) 
+		(BC_ProgressBar::calculate_h() + 5) * nbars, 0, 0, 0)
 {
 	this->sswindow = sswindow;
 	this->nlines = nlines;
@@ -787,8 +787,8 @@ stop()
 	if( running() ) {
 		if( gui ) gui->set_done(1);
 		cancel();
-		join();
 	}
+	join();
 }
 
 void ScanStatus::
@@ -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;
 }
 
@@ -856,8 +858,8 @@ stop()
 		done = 1;
 		input_lock->unlock();
 		cancel();
-		join();
 	}
+	join();
 	if( commercials && !commercials->remove_user() )
 		commercials = 0;
 }