X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fplugin_manager.cc;h=a666e7b53ecab8372578342ba18aca1fe62097f3;hb=eaf58fdd50a79aa4fa2760ca5dbeb2dd4cda2e15;hp=88dc4c13a7d9db82e27365fe7299ec1d03e2d7cb;hpb=4aeebb914eedf9279e4904786ce42518611de137;p=ardour.git diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index 88dc4c13a7..a666e7b53e 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -30,15 +30,15 @@ #include #include -#ifdef VST_SUPPORT -#include +#ifdef WINDOWS_VST_SUPPORT +#include "fst.h" #include "pbd/basename.h" #include -#endif // VST_SUPPORT +#endif // WINDOWS_VST_SUPPORT #ifdef LXVST_SUPPORT -#include -#include +#include "ardour/linux_vst_support.h" +#include "pbd/basename.h" #include #endif //LXVST_SUPPORT @@ -53,14 +53,14 @@ #include "ardour/ladspa_plugin.h" #include "ardour/plugin.h" #include "ardour/plugin_manager.h" -#include "ardour/session.h" +#include "ardour/rc_configuration.h" #ifdef LV2_SUPPORT #include "ardour/lv2_plugin.h" #endif -#ifdef VST_SUPPORT -#include "ardour/vst_plugin.h" +#ifdef WINDOWS_VST_SUPPORT +#include "ardour/windows_vst_plugin.h" #endif #ifdef LXVST_SUPPORT @@ -81,10 +81,19 @@ 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) + : _windows_vst_plugin_info(0) , _lxvst_plugin_info(0) , _ladspa_plugin_info(0) , _lv2_plugin_info(0) @@ -105,11 +114,11 @@ PluginManager::PluginManager () add_lrdf_data(lrdf_path); add_ladspa_presets(); -#ifdef VST_SUPPORT - if (Config->get_use_vst()) { - add_vst_presets(); +#ifdef WINDOWS_VST_SUPPORT + if (Config->get_use_windows_vst ()) { + add_windows_vst_presets (); } -#endif /* VST_SUPPORT */ +#endif /* WINDOWS_VST_SUPPORT */ #ifdef LXVST_SUPPORT if (Config->get_use_lxvst()) { @@ -122,9 +131,9 @@ PluginManager::PluginManager () } if ((s = getenv ("VST_PATH"))) { - vst_path = s; + windows_vst_path = s; } else if ((s = getenv ("VST_PLUGINS"))) { - vst_path = s; + windows_vst_path = s; } if ((s = getenv ("LXVST_PATH"))) { @@ -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 */ @@ -167,11 +176,11 @@ PluginManager::refresh () #ifdef LV2_SUPPORT lv2_refresh (); #endif -#ifdef VST_SUPPORT - if (Config->get_use_vst()) { - vst_refresh (); +#ifdef WINDOWS_VST_SUPPORT + if (Config->get_use_windows_vst()) { + windows_vst_refresh (); } -#endif // VST_SUPPORT +#endif // WINDOWS_VST_SUPPORT #ifdef LXVST_SUPPORT if(Config->get_use_lxvst()) { @@ -263,7 +272,7 @@ PluginManager::ladspa_discover_from_path (string /*path*/) vector::iterator x; int ret = 0; - plugin_objects = scanner (ladspa_path, ladspa_filter, 0, true, true); + plugin_objects = scanner (ladspa_path, ladspa_filter, 0, false, true); if (plugin_objects) { for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) { @@ -291,9 +300,9 @@ PluginManager::add_ladspa_presets() } void -PluginManager::add_vst_presets() +PluginManager::add_windows_vst_presets() { - add_presets ("vst"); + add_presets ("windows-vst"); } void @@ -316,7 +325,7 @@ PluginManager::add_presets(string domain) } string path = string_compose("%1/.%2/rdf", envvar, domain); - presets = scanner (path, rdf_filter, 0, true, true); + presets = scanner (path, rdf_filter, 0, false, true); if (presets) { for (x = presets->begin(); x != presets->end (); ++x) { @@ -337,7 +346,7 @@ PluginManager::add_lrdf_data (const string &path) vector* rdf_files; vector::iterator x; - rdf_files = scanner (path, rdf_filter, 0, true, true); + rdf_files = scanner (path, rdf_filter, 0, false, true); if (rdf_files) { for (x = rdf_files->begin(); x != rdf_files->end (); ++x) { @@ -517,35 +526,36 @@ PluginManager::au_refresh () #endif -#ifdef VST_SUPPORT +#ifdef WINDOWS_VST_SUPPORT void -PluginManager::vst_refresh () +PluginManager::windows_vst_refresh () { - if (_vst_plugin_info) - _vst_plugin_info->clear (); - else - _vst_plugin_info = new ARDOUR::PluginInfoList(); + if (_windows_vst_plugin_info) { + _windows_vst_plugin_info->clear (); + } else { + _windows_vst_plugin_info = new ARDOUR::PluginInfoList(); + } - if (vst_path.length() == 0) { - vst_path = "/usr/local/lib/vst:/usr/lib/vst"; + if (windows_vst_path.length() == 0) { + windows_vst_path = "/usr/local/lib/vst:/usr/lib/vst"; } - vst_discover_from_path (vst_path); + windows_vst_discover_from_path (windows_vst_path); } int -PluginManager::add_vst_directory (string path) +PluginManager::add_windows_vst_directory (string path) { - if (vst_discover_from_path (path) == 0) { - vst_path += ':'; - vst_path += path; + if (windows_vst_discover_from_path (path) == 0) { + windows_vst_path += ':'; + windows_vst_path += path; return 0; } return -1; } -static bool vst_filter (const string& str, void *arg) +static bool windows_vst_filter (const string& str, void *arg) { /* Not a dotfile, has a prefix before a period, suffix is "dll" */ @@ -553,20 +563,20 @@ static bool vst_filter (const string& str, void *arg) } int -PluginManager::vst_discover_from_path (string path) +PluginManager::windows_vst_discover_from_path (string path) { PathScanner scanner; vector *plugin_objects; vector::iterator x; int ret = 0; - info << "detecting VST plugins along " << path << endmsg; + DEBUG_TRACE (DEBUG::PluginManager, string_compose ("detecting Windows VST plugins along %1\n", path)); - plugin_objects = scanner (vst_path, vst_filter, 0, true, true); + plugin_objects = scanner (windows_vst_path, windows_vst_filter, 0, false, true); if (plugin_objects) { for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) { - vst_discover (**x); + windows_vst_discover (**x); } } @@ -575,13 +585,13 @@ PluginManager::vst_discover_from_path (string path) } int -PluginManager::vst_discover (string path) +PluginManager::windows_vst_discover (string path) { - FSTInfo* finfo; + VSTInfo* finfo; char buf[32]; if ((finfo = fst_get_info (const_cast (path.c_str()))) == 0) { - warning << "Cannot get VST information from " << path << endmsg; + warning << "Cannot get Windows VST information from " << path << endmsg; return -1; } @@ -591,7 +601,7 @@ PluginManager::vst_discover (string path) << endl; } - PluginInfoPtr info(new VSTPluginInfo); + PluginInfoPtr info (new WindowsVSTPluginInfo); /* what a joke freeware VST is */ @@ -611,15 +621,15 @@ PluginManager::vst_discover (string path) info->n_inputs.set_audio (finfo->numInputs); info->n_outputs.set_audio (finfo->numOutputs); info->n_inputs.set_midi (finfo->wantMidi ? 1 : 0); - info->type = ARDOUR::VST; + info->type = ARDOUR::Windows_VST; - _vst_plugin_info->push_back (info); + _windows_vst_plugin_info->push_back (info); fst_free_info (finfo); return 0; } -#endif // VST_SUPPORT +#endif // WINDOWS_VST_SUPPORT #ifdef LXVST_SUPPORT @@ -665,9 +675,9 @@ PluginManager::lxvst_discover_from_path (string path) vector::iterator x; int ret = 0; - info << "Discovering linuxVST plugins along " << path << endmsg; + DEBUG_TRACE (DEBUG::PluginManager, string_compose ("Discovering linuxVST plugins along %1\n", path)); - plugin_objects = scanner (lxvst_path, lxvst_filter, 0, true, true); + plugin_objects = scanner (lxvst_path, lxvst_filter, 0, false, true); if (plugin_objects) { for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) { @@ -675,8 +685,6 @@ PluginManager::lxvst_discover_from_path (string path) } } - info << "Done linuxVST discover" << endmsg; - vector_delete (plugin_objects); return ret; } @@ -684,11 +692,10 @@ PluginManager::lxvst_discover_from_path (string path) int PluginManager::lxvst_discover (string path) { - VSTFXInfo* finfo; + VSTInfo* finfo; char buf[32]; if ((finfo = vstfx_get_info (const_cast (path.c_str()))) == 0) { - warning << "Cannot get linuxVST information from " << path << endmsg; return -1; } @@ -728,6 +735,7 @@ PluginManager::lxvst_discover (string path) if (!_lxvst_plugin_info->empty()) { for (PluginInfoList::iterator i =_lxvst_plugin_info->begin(); i != _lxvst_plugin_info->end(); ++i) { if ((info->type == (*i)->type)&&(info->unique_id == (*i)->unique_id)) { + warning << "Ignoring duplicate Linux VST plugin " << info->name << "\n"; vstfx_free_info(finfo); return 0; } @@ -779,8 +787,8 @@ PluginManager::save_statuses () case LV2: ofs << "LV2"; break; - case VST: - ofs << "VST"; + case Windows_VST: + ofs << "Windows-VST"; break; case LXVST: ofs << "LXVST"; @@ -867,8 +875,8 @@ PluginManager::load_statuses () type = AudioUnit; } else if (stype == "LV2") { type = LV2; - } else if (stype == "VST") { - type = VST; + } else if (stype == "Windows-VST") { + type = Windows_VST; } else if (stype == "LXVST") { type = LXVST; } else { @@ -899,12 +907,13 @@ PluginManager::set_status (PluginType t, string id, PluginStatusType status) } ARDOUR::PluginInfoList& -PluginManager::vst_plugin_info () +PluginManager::windows_vst_plugin_info () { -#ifdef VST_SUPPORT - if (!_vst_plugin_info) - vst_refresh(); - return *_vst_plugin_info; +#ifdef WINDOWS_VST_SUPPORT + if (!_windows_vst_plugin_info) { + windows_vst_refresh (); + } + return *_windows_vst_plugin_info; #else return _empty_plugin_info; #endif