make PluginManager API more in line with other singletons; do initial plugin discover...

[ardour.git] / libs / ardour / plugin_manager.cc

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index cc0fd554d5f6b6b367579a5a4cd11db3740d324b..d15f48e5f3078c85452236d61466f7620a72d7ba 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -81,7 +81,16 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace std;
 
-PluginManager* PluginManager::_manager = 0;
+PluginManager* PluginManager::_instance = 0;
+
+PluginManager&
+PluginManager::instance() 
+{
+       if (!_instance) {
+               _instance = new PluginManager;
+       }
+       return *_instance;
+}
 
 PluginManager::PluginManager ()
        : _vst_plugin_info(0)
@@ -133,8 +142,8 @@ PluginManager::PluginManager ()
                lxvst_path = s;
        }
 
-       if (_manager == 0) {
-               _manager = this;
+       if (_instance == 0) {
+               _instance = this;
        }
 
        /* the plugin manager is constructed too early to use Profile */