summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/plugin_manager.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-11-14 17:41:29 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-11-14 17:41:29 +0000
commitc66955386ecfb86b3dd2b137a8e6e4143711f329 (patch)
tree5da85b4fcf3b6c0c4c8cf2f4a49d2ed1eb88a147 /libs/ardour/ardour/plugin_manager.h
parent28f328e09c6227ab6248c91ae0690a02d9d23300 (diff)
make PluginManager API more in line with other singletons; do initial plugin discovery before beginning to construct the UI, so that if plugins create GUIs (e.g for license verification) they don't cause a run loop to catch the UIManager in an inconsistent state with menus defined but actions missing
git-svn-id: svn://localhost/ardour2/branches/3.0@10586 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/plugin_manager.h')
-rw-r--r--libs/ardour/ardour/plugin_manager.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h
index ae534837ce..3c5ae5e18a 100644
--- a/libs/ardour/ardour/plugin_manager.h
+++ b/libs/ardour/ardour/plugin_manager.h
@@ -39,7 +39,8 @@ class Plugin;
class PluginManager : public boost::noncopyable {
public:
- PluginManager ();
+ static PluginManager& instance();
+
~PluginManager ();
ARDOUR::PluginInfoList &vst_plugin_info ();
@@ -54,8 +55,6 @@ class PluginManager : public boost::noncopyable {
int add_vst_directory (std::string dirpath);
int add_lxvst_directory (std::string dirpath);
- static PluginManager* the_manager() { return _manager; }
-
enum PluginStatusType {
Normal = 0,
Favorite,
@@ -134,7 +133,8 @@ class PluginManager : public boost::noncopyable {
std::string get_ladspa_category (uint32_t id);
std::vector<uint32_t> ladspa_plugin_whitelist;
- static PluginManager* _manager; // singleton
+ static PluginManager* _instance; // singleton
+ PluginManager ();
};
} /* namespace ARDOUR */