comparison plugin/NativeVampPluginFactory.cpp @ 1830:5f8fbbde08ff audio-source-refactor

Use shared_ptr for plugin instances throughout

 
         return "";
     }
 }
 
-Vamp::Plugin *
+std::shared_ptr<Vamp::Plugin>
 NativeVampPluginFactory::instantiatePlugin(QString identifier,
                                            sv_samplerate_t inputSampleRate)
 {
     Profiler profiler("NativeVampPluginFactory::instantiatePlugin");
 
-    Vamp::Plugin *rv = nullptr;
+    std::shared_ptr<Vamp::Plugin> rv = nullptr;
     Vamp::PluginHostAdapter *plugin = nullptr;
 
     const VampPluginDescriptor *descriptor = nullptr;
     int index = 0;
 

 
     plugin = new Vamp::PluginHostAdapter(descriptor, float(inputSampleRate));
 
     if (plugin) {
         m_handleMap[plugin] = libraryHandle;
-        rv = new PluginDeletionNotifyAdapter(plugin, this);
+        rv = std::shared_ptr<Vamp::Plugin>
+            (new PluginDeletionNotifyAdapter(plugin, this));
     }
 
 #ifdef DEBUG_PLUGIN_SCAN_AND_INSTANTIATE
     if (rv) {
         SVCERR << "NativeVampPluginFactory::instantiatePlugin: Instantiated plugin " << label << " from library " << soname << ": descriptor " << descriptor << ", rv "<< rv << ", label " << rv->getName() << ", outputs " << rv->getOutputDescriptors().size() << endl;

     
     return rv;
 }
 
 void
-NativeVampPluginFactory::pluginDeleted(Vamp::Plugin *plugin)
+NativeVampPluginFactory::pluginDeleted(Vamp::Plugin* plugin)
 {
     void *handle = m_handleMap[plugin];
     if (!handle) return;
 
     m_handleMap.erase(plugin);

     std::vector<std::string> catlist;
     for (auto s: getPluginCategory(identifier).split(" > ")) {
         catlist.push_back(s.toStdString());
     }
     
-    Vamp::Plugin *p = instantiatePlugin(identifier, 44100);
+    std::shared_ptr<Vamp::Plugin> p = instantiatePlugin(identifier, 44100);
     if (!p) return {};
 
     auto psd = piper_vamp::PluginStaticData::fromPlugin(pluginKey,
                                                         catlist,
-                                                        p);
-
-    delete p;
-    
+                                                        p.get());
+
     m_pluginData[identifier] = psd;
     return psd;
 }