X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpluginlv2config.C;h=66c9a498b8e17811d6d1314b81b6fd42debe4266;hp=776f9d67b15b53982b14d593a8dbf965465067f4;hb=803cf48f8f7ee246eb5473e55fc2125e8b398250;hpb=efb3600851fd27b13d3053ffbdb6434535580bfd

diff --git a/cinelerra-5.1/cinelerra/pluginlv2config.C b/cinelerra-5.1/cinelerra/pluginlv2config.C
index 776f9d67..66c9a498 100644
--- a/cinelerra-5.1/cinelerra/pluginlv2config.C
+++ b/cinelerra-5.1/cinelerra/pluginlv2config.C
@@ -29,6 +29,7 @@
 #include <string.h>
 
 PluginLV2UriTable::PluginLV2UriTable()
+ : Mutex("PluginLV2UriTable::PluginLV2UriTable")
 {
 	set_array_delete();
 }
@@ -40,18 +41,21 @@ PluginLV2UriTable::~PluginLV2UriTable()
 
 LV2_URID PluginLV2UriTable::map(const char *uri)
 {
-	mLock locker(uri_table_lock);
-	for( int i=0; i<size(); ++i )
-		if( !strcmp(uri, get(i)) ) return i+1;
-	append(cstrdup(uri));
-	return size();
+	lock("PluginLV2UriTable::map");
+	int i = 0, n = size();
+	while( i<n && strcmp(uri, get(i)) ) ++i;
+	if( i >= n ) append(cstrdup(uri));
+	unlock();
+	return i+1;
 }
 
 const char *PluginLV2UriTable::unmap(LV2_URID urid)
 {
-	mLock locker(uri_table_lock);
+	lock("PluginLV2UriTable::unmap");
 	int idx = urid - 1;
-	return idx>=0 && idx<size() ? get(idx) : 0;
+	const char *ret = idx>=0 && idx<size() ? get(idx) : 0;
+	unlock();
+	return ret;
 }
 
 PluginLV2Client_OptName:: PluginLV2Client_OptName(PluginLV2Client_Opt *opt)