comparison vamp-sdk/PluginAdapter.cpp @ 13:85801331454c

* Make static adapter map a pointer to avoid any confusion about static
  destructor ordering

     m_descriptor.releaseOutputDescriptor = vampReleaseOutputDescriptor;
     m_descriptor.process = vampProcess;
     m_descriptor.getRemainingFeatures = vampGetRemainingFeatures;
     m_descriptor.releaseFeatureSet = vampReleaseFeatureSet;
     
-    m_adapterMap[&m_descriptor] = this;
+    if (!m_adapterMap) {
+        m_adapterMap = new AdapterMap;
+        (*m_adapterMap)[&m_descriptor] = this;
+    }
 
     delete plugin;
 
     m_populated = true;
     return &m_descriptor;

     for (unsigned int i = 0; i < m_descriptor.programCount; ++i) {
         free((void *)m_descriptor.programs[i]);
     }
     free((void *)m_descriptor.programs);
 
-    m_adapterMap.erase(&m_descriptor);
+    if (m_adapterMap) {
+        
+        m_adapterMap->erase(&m_descriptor);
+
+        if (m_adapterMap->empty()) {
+            delete m_adapterMap;
+            m_adapterMap = 0;
+        }
+    }
 }
 
 PluginAdapterBase *
 PluginAdapterBase::lookupAdapter(VampPluginHandle handle)
 {
-    AdapterMap::const_iterator i = m_adapterMap.find(handle);
-    if (i == m_adapterMap.end()) return 0;
+    if (!m_adapterMap) return 0;
+    AdapterMap::const_iterator i = m_adapterMap->find(handle);
+    if (i == m_adapterMap->end()) return 0;
     return i->second;
 }
 
 VampPluginHandle
 PluginAdapterBase::vampInstantiate(const VampPluginDescriptor *desc,
                                    float inputSampleRate)
 {
-    if (m_adapterMap.find(desc) == m_adapterMap.end()) return 0;
-    PluginAdapterBase *adapter = m_adapterMap[desc];
+    if (!m_adapterMap) return 0;
+    if (m_adapterMap->find(desc) == m_adapterMap->end()) return 0;
+    PluginAdapterBase *adapter = (*m_adapterMap)[desc];
     if (desc != &adapter->m_descriptor) return 0;
 
     Plugin *plugin = adapter->createPlugin(inputSampleRate);
     if (plugin) {
-        m_adapterMap[plugin] = adapter;
+        (*m_adapterMap)[plugin] = adapter;
     }
 
     return plugin;
 }
 

 
     if (m_pluginOutputs.find(plugin) != m_pluginOutputs.end()) {
         delete m_pluginOutputs[plugin];
         m_pluginOutputs.erase(plugin);
     }
-    m_adapterMap.erase(plugin);
+
+    if (m_adapterMap) {
+        m_adapterMap->erase(plugin);
+
+        if (m_adapterMap->empty()) {
+            delete m_adapterMap;
+            m_adapterMap = 0;
+        }
+    }
+
     delete ((Plugin *)plugin);
 }
 
 void 
 PluginAdapterBase::checkOutputMap(Plugin *plugin)

         (m_fs[plugin][n].features[j].values, sz * sizeof(float));
 
     m_fvsizes[plugin][n][j] = sz;
 }
   
-PluginAdapterBase::AdapterMap 
-PluginAdapterBase::m_adapterMap;
-
-}
-
+PluginAdapterBase::AdapterMap *
+PluginAdapterBase::m_adapterMap = 0;
+
+}
+