diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-14 17:41:29 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-14 17:41:29 +0000 |
| commit | c66955386ecfb86b3dd2b137a8e6e4143711f329 (patch) | |
| tree | 5da85b4fcf3b6c0c4c8cf2f4a49d2ed1eb88a147 /libs/ardour/plugin.cc | |
| parent | 28f328e09c6227ab6248c91ae0690a02d9d23300 (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/plugin.cc')
| -rw-r--r-- | libs/ardour/plugin.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc index 21ad91ff0e..bf22de6c6c 100644 --- a/libs/ardour/plugin.cc +++ b/libs/ardour/plugin.cc @@ -119,35 +119,35 @@ Plugin::save_preset (string name) PluginPtr ARDOUR::find_plugin(Session& session, string identifier, PluginType type) { - PluginManager *mgr = PluginManager::the_manager(); + PluginManager& mgr (PluginManager::instance()); PluginInfoList plugs; switch (type) { case ARDOUR::LADSPA: - plugs = mgr->ladspa_plugin_info(); + plugs = mgr.ladspa_plugin_info(); break; #ifdef LV2_SUPPORT case ARDOUR::LV2: - plugs = mgr->lv2_plugin_info(); + plugs = mgr.lv2_plugin_info(); break; #endif #ifdef VST_SUPPORT case ARDOUR::VST: - plugs = mgr->vst_plugin_info(); + plugs = mgr.vst_plugin_info(); break; #endif #ifdef LXVST_SUPPORT case ARDOUR::LXVST: - plugs = mgr->lxvst_plugin_info(); + plugs = mgr.lxvst_plugin_info(); break; #endif #ifdef AUDIOUNIT_SUPPORT case ARDOUR::AudioUnit: - plugs = mgr->au_plugin_info(); + plugs = mgr.au_plugin_info(); break; #endif |