change several startup messages to be triggered only by -D (debug) options
[ardour.git] / libs / ardour / plugin_manager.cc
index ce7a94a517249cfb0fffe47579e50aeb1a4fa942..dc717e6b8c39ceeddeb351fb844e489ee537593f 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2006 Paul Davis 
+    Copyright (C) 2000-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 */
 
-#define __STDC_FORMAT_MACROS 1
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
 #include <stdint.h>
 
 #include <sys/types.h>
 #include <cstring>
 #endif // VST_SUPPORT
 
+#ifdef LXVST_SUPPORT
+#include <ardour/vstfx.h>
+#include <pbd/basename.h>
+#include <cstring>
+#endif //LXVST_SUPPORT
+
 #include <glibmm/miscutils.h>
 
 #include "pbd/pathscanner.h"
+#include "pbd/whitespace.h"
 
+#include "ardour/debug.h"
+#include "ardour/filesystem_paths.h"
 #include "ardour/ladspa.h"
-#include "ardour/session.h"
-#include "ardour/plugin_manager.h"
-#include "ardour/plugin.h"
 #include "ardour/ladspa_plugin.h"
-#include "ardour/filesystem_paths.h"
+#include "ardour/plugin.h"
+#include "ardour/plugin_manager.h"
+#include "ardour/session.h"
 
-#ifdef HAVE_SLV2
-#include <slv2/slv2.h>
+#ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
 #endif
 
 #include "ardour/vst_plugin.h"
 #endif
 
-#ifdef HAVE_AUDIOUNITS
+#ifdef LXVST_SUPPORT
+#include "ardour/lxvst_plugin.h"
+#endif
+
+#ifdef AUDIOUNIT_SUPPORT
 #include "ardour/audio_unit.h"
 #include <Carbon/Carbon.h>
 #endif
@@ -70,19 +84,16 @@ using namespace std;
 PluginManager* PluginManager::_manager = 0;
 
 PluginManager::PluginManager ()
+       : _vst_plugin_info(0)
+       , _lxvst_plugin_info(0)
+       , _ladspa_plugin_info(0)
+       , _lv2_plugin_info(0)
+       , _au_plugin_info(0)
 {
        char* s;
        string lrdf_path;
 
-       load_favorites ();
-
-#ifdef GTKOSX
-       ProcessSerialNumber psn = { 0, kCurrentProcess }; 
-       OSStatus returnCode = TransformProcessType(& psn, kProcessTransformToForegroundApplication);
-       if( returnCode != 0) {
-               error << _("Cannot become GUI app") << endmsg;
-       }
-#endif
+       load_statuses ();
 
        if ((s = getenv ("LADSPA_RDF_PATH"))){
                lrdf_path = s;
@@ -100,6 +111,12 @@ PluginManager::PluginManager ()
        }
 #endif /* VST_SUPPORT */
 
+#ifdef LXVST_SUPPORT
+       if (Config->get_use_lxvst()) {
+               add_lxvst_presets();
+       }
+#endif /* Native LinuxVST support*/
+
        if ((s = getenv ("LADSPA_PATH"))) {
                ladspa_path = s;
        }
@@ -110,6 +127,12 @@ PluginManager::PluginManager ()
                vst_path = s;
        }
 
+       if ((s = getenv ("LXVST_PATH"))) {
+               lxvst_path = s;
+       } else if ((s = getenv ("LXVST_PLUGINS"))) {
+               lxvst_path = s;
+       }
+
        if (_manager == 0) {
                _manager = this;
        }
@@ -124,23 +147,24 @@ PluginManager::PluginManager ()
                ladspa_plugin_whitelist.push_back (1061); // feedback delay line (max 5s)
                ladspa_plugin_whitelist.push_back (1216); // gverb
                ladspa_plugin_whitelist.push_back (2150); // tap pitch shifter
-       } 
-
-#ifdef HAVE_SLV2
-       cerr << "Creating a new lv2 world\n";
-       _lv2_world = new LV2World();
-#endif
+       }
 
        BootMessage (_("Discovering Plugins"));
+}
 
-       refresh ();
+
+PluginManager::~PluginManager()
+{
 }
 
+
 void
 PluginManager::refresh ()
 {
+       DEBUG_TRACE (DEBUG::PluginManager, "PluginManager::refresh\n");
+
        ladspa_refresh ();
-#ifdef HAVE_SLV2
+#ifdef LV2_SUPPORT
        lv2_refresh ();
 #endif
 #ifdef VST_SUPPORT
@@ -148,53 +172,67 @@ PluginManager::refresh ()
                vst_refresh ();
        }
 #endif // VST_SUPPORT
-#ifdef HAVE_AUDIOUNITS
+
+#ifdef LXVST_SUPPORT
+       if(Config->get_use_lxvst()) {
+               lxvst_refresh();
+       }
+#endif //Native linuxVST SUPPORT
+
+#ifdef AUDIOUNIT_SUPPORT
        au_refresh ();
 #endif
+
+       PluginListChanged (); /* EMIT SIGNAL */
 }
 
 void
 PluginManager::ladspa_refresh ()
 {
-       _ladspa_plugin_info.clear ();
-       
-       static const char *standard_paths[] = {
-               "/usr/local/lib64/ladspa",
-               "/usr/local/lib/ladspa",
-               "/usr/lib64/ladspa",
-               "/usr/lib/ladspa",
-               "/Library/Audio/Plug-Ins/LADSPA",
-               ""
-       };
-       
-       /* allow LADSPA_PATH to augment, not override standard locations */
-       /* Only add standard locations to ladspa_path if it doesn't
-        * already contain them. Check for trailing '/'s too.
-        */
-        
-       int i;
-       for (i = 0; standard_paths[i][0]; i++) {
-               size_t found = ladspa_path.find(standard_paths[i]);
-               if (found != ladspa_path.npos) {
-                       switch (ladspa_path[found + strlen(standard_paths[i])]) {
-                               case ':' :
-                               case '\0':
-                                       continue;
-                               case '/' :
-                                       if (ladspa_path[found + strlen(standard_paths[i]) + 1] == ':' ||
-                                           ladspa_path[found + strlen(standard_paths[i]) + 1] == '\0') {
-                                               continue;
-                                       }
-                       }
-               }
-               if (!ladspa_path.empty())
-                       ladspa_path += ":";
-               ladspa_path += standard_paths[i]; 
-               
-       }
-  
+       if (_ladspa_plugin_info)
+               _ladspa_plugin_info->clear ();
+       else
+               _ladspa_plugin_info = new ARDOUR::PluginInfoList ();
+
+       static const char *standard_paths[] = {
+               "/usr/local/lib64/ladspa",
+               "/usr/local/lib/ladspa",
+               "/usr/lib64/ladspa",
+               "/usr/lib/ladspa",
+               "/Library/Audio/Plug-Ins/LADSPA",
+               ""
+       };
+
+       /* allow LADSPA_PATH to augment, not override standard locations */
+
+       /* Only add standard locations to ladspa_path if it doesn't
+        * already contain them. Check for trailing G_DIR_SEPARATOR too.
+        */
+
+       int i;
+       for (i = 0; standard_paths[i][0]; i++) {
+               size_t found = ladspa_path.find(standard_paths[i]);
+               if (found != ladspa_path.npos) {
+                       switch (ladspa_path[found + strlen(standard_paths[i])]) {
+                               case ':' :
+                               case '\0':
+                                       continue;
+                               case G_DIR_SEPARATOR :
+                                       if (ladspa_path[found + strlen(standard_paths[i]) + 1] == ':' ||
+                                           ladspa_path[found + strlen(standard_paths[i]) + 1] == '\0') {
+                                               continue;
+                                       }
+                       }
+               }
+               if (!ladspa_path.empty())
+                       ladspa_path += ":";
+
+               ladspa_path += standard_paths[i];
+
+       }
+
+       DEBUG_TRACE (DEBUG::PluginManager, string_compose ("LADSPA: search along: [%1]\n", ladspa_path));
+
        ladspa_discover_from_path (ladspa_path);
 }
 
@@ -206,19 +244,19 @@ PluginManager::add_ladspa_directory (string path)
                ladspa_path += ':';
                ladspa_path += path;
                return 0;
-       } 
+       }
        return -1;
 }
 
-static bool ladspa_filter (const string& str, void *arg)
+static bool ladspa_filter (const string& str, void */*arg*/)
 {
        /* Not a dotfile, has a prefix before a period, suffix is "so" */
-       
+
        return str[0] != '.' && (str.length() > 3 && str.find (".so") == (str.length() - 3));
 }
 
 int
-PluginManager::ladspa_discover_from_path (string path)
+PluginManager::ladspa_discover_from_path (string /*path*/)
 {
        PathScanner scanner;
        vector<string *> *plugin_objects;
@@ -237,12 +275,13 @@ PluginManager::ladspa_discover_from_path (string path)
        return ret;
 }
 
-static bool rdf_filter (const string &str, void *arg)
+static bool rdf_filter (const string &str, void* /*arg*/)
 {
-       return str[0] != '.' && 
+       return str[0] != '.' &&
                   ((str.find(".rdf")  == (str.length() - 4)) ||
             (str.find(".rdfs") == (str.length() - 5)) ||
-                   (str.find(".n3")   == (str.length() - 3)));
+                   (str.find(".n3")   == (str.length() - 3)) ||
+                   (str.find(".ttl")  == (str.length() - 4)));
 }
 
 void
@@ -256,6 +295,13 @@ PluginManager::add_vst_presets()
 {
        add_presets ("vst");
 }
+
+void
+PluginManager::add_lxvst_presets()
+{
+       add_presets ("lxvst");
+}
+
 void
 PluginManager::add_presets(string domain)
 {
@@ -290,13 +336,12 @@ PluginManager::add_lrdf_data (const string &path)
        PathScanner scanner;
        vector<string *>* rdf_files;
        vector<string *>::iterator x;
-       string uri;
 
        rdf_files = scanner (path, rdf_filter, 0, true, true);
 
        if (rdf_files) {
                for (x = rdf_files->begin(); x != rdf_files->end (); ++x) {
-                       uri = "file://" + **x;
+                       const string uri(string("file://") + **x);
 
                        if (lrdf_read_file(uri.c_str())) {
                                warning << "Could not parse rdf file: " << uri << endmsg;
@@ -307,7 +352,7 @@ PluginManager::add_lrdf_data (const string &path)
        vector_delete (rdf_files);
 }
 
-int 
+int
 PluginManager::ladspa_discover (string path)
 {
        void *module;
@@ -338,7 +383,7 @@ PluginManager::ladspa_discover (string path)
                        if (find (ladspa_plugin_whitelist.begin(), ladspa_plugin_whitelist.end(), descriptor->UniqueID) == ladspa_plugin_whitelist.end()) {
                                continue;
                        }
-               } 
+               }
 
                PluginInfoPtr info(new LadspaPluginInfo);
                info->name = descriptor->Name;
@@ -349,11 +394,11 @@ PluginManager::ladspa_discover (string path)
                info->n_inputs = ChanCount();
                info->n_outputs = ChanCount();
                info->type = ARDOUR::LADSPA;
-               
+
                char buf[32];
                snprintf (buf, sizeof (buf), "%lu", descriptor->UniqueID);
                info->unique_id = buf;
-               
+
                for (uint32_t n=0; n < descriptor->PortCount; ++n) {
                        if ( LADSPA_IS_PORT_AUDIO (descriptor->PortDescriptors[n]) ) {
                                if ( LADSPA_IS_PORT_INPUT (descriptor->PortDescriptors[n]) ) {
@@ -365,22 +410,22 @@ PluginManager::ladspa_discover (string path)
                        }
                }
 
-               if(_ladspa_plugin_info.empty()){
-                       _ladspa_plugin_info.push_back (info);
+               if(_ladspa_plugin_info->empty()){
+                       _ladspa_plugin_info->push_back (info);
                }
 
                //Ensure that the plugin is not already in the plugin list.
 
                bool found = false;
 
-               for (PluginInfoList::const_iterator i = _ladspa_plugin_info.begin(); i != _ladspa_plugin_info.end(); ++i) {
+               for (PluginInfoList::const_iterator i = _ladspa_plugin_info->begin(); i != _ladspa_plugin_info->end(); ++i) {
                        if(0 == info->unique_id.compare((*i)->unique_id)){
                              found = true;
                        }
                }
 
                if(!found){
-                   _ladspa_plugin_info.push_back (info);
+                   _ladspa_plugin_info->push_back (info);
                }
        }
 
@@ -405,7 +450,7 @@ PluginManager::get_ladspa_category (uint32_t plugin_id)
        lrdf_statement* matches1 = lrdf_matches (&pattern);
 
        if (!matches1) {
-               return "";
+               return "Unknown";
        }
 
        pattern.subject = matches1->object;
@@ -417,42 +462,57 @@ PluginManager::get_ladspa_category (uint32_t plugin_id)
        lrdf_free_statements(matches1);
 
        if (!matches2) {
-               return ("");
+               return ("Unknown");
        }
 
        string label = matches2->object;
        lrdf_free_statements(matches2);
 
-       return label;
+       /* Kludge LADSPA class names to be singular and match LV2 class names.
+          This avoids duplicate plugin menus for every class, which is necessary
+          to make the plugin category menu at all usable, but is obviously a
+          filthy kludge.
+
+          In the short term, lrdf could be updated so the labels match and a new
+          release made. To support both specs, we should probably be mapping the
+          URIs to the same category in code and perhaps tweaking that hierarchy
+          dynamically to suit the user. Personally, I (drobilla) think that time
+          is better spent replacing the little-used LRDF.
+
+          In the longer term, we will abandon LRDF entirely in favour of LV2 and
+          use that class hierarchy. Aside from fixing this problem properly, that
+          will also allow for translated labels. SWH plugins have been LV2 for
+          ages; TAP needs porting. I don't know of anything else with LRDF data.
+       */
+       if (label == "Utilities") {
+               return "Utility";
+       } else if (label == "Pitch shifters") {
+               return "Pitch Shifter";
+       } else if (label != "Dynamics" && label != "Chorus"
+                  &&label[label.length() - 1] == 's'
+                  && label[label.length() - 2] != 's') {
+               return label.substr(0, label.length() - 1);
+       } else {
+               return label;
+       }
 }
 
-#ifdef HAVE_SLV2
+#ifdef LV2_SUPPORT
 void
 PluginManager::lv2_refresh ()
 {
-       lv2_discover();
-}
-
-int
-PluginManager::lv2_discover ()
-{
-       _lv2_plugin_info = LV2PluginInfo::discover(_lv2_world);
-       return 0;
+       delete _lv2_plugin_info;
+       _lv2_plugin_info = LV2PluginInfo::discover();
 }
 #endif
 
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
 void
 PluginManager::au_refresh ()
 {
-       au_discover();
-}
-
-int
-PluginManager::au_discover ()
-{
+       DEBUG_TRACE (DEBUG::PluginManager, "AU: refresh\n");
+       delete _au_plugin_info;
        _au_plugin_info = AUPluginInfo::discover();
-       return 0;
 }
 
 #endif
@@ -462,7 +522,10 @@ PluginManager::au_discover ()
 void
 PluginManager::vst_refresh ()
 {
-       _vst_plugin_info.clear ();
+       if (_vst_plugin_info)
+               _vst_plugin_info->clear ();
+       else
+               _vst_plugin_info = new ARDOUR::PluginInfoList();
 
        if (vst_path.length() == 0) {
                vst_path = "/usr/local/lib/vst:/usr/lib/vst";
@@ -478,7 +541,7 @@ PluginManager::add_vst_directory (string path)
                vst_path += ':';
                vst_path += path;
                return 0;
-       } 
+       }
        return -1;
 }
 
@@ -497,7 +560,7 @@ PluginManager::vst_discover_from_path (string path)
        vector<string *>::iterator x;
        int ret = 0;
 
-       info << "detecting VST plugins along " << path << endmsg;
+       DEBUG_TRACE (DEBUG::PluginManager, string_compose ("detecting VST plugins along %1\n", path));
 
        plugin_objects = scanner (vst_path, vst_filter, 0, true, true);
 
@@ -527,7 +590,7 @@ PluginManager::vst_discover (string path)
                                    finfo->name)
                        << endl;
        }
-       
+
        PluginInfoPtr info(new VSTPluginInfo);
 
        /* what a joke freeware VST is */
@@ -538,7 +601,7 @@ PluginManager::vst_discover (string path)
                info->name = finfo->name;
        }
 
-       
+
        snprintf (buf, sizeof (buf), "%d", finfo->UniqueID);
        info->unique_id = buf;
        info->category = "VST";
@@ -547,9 +610,10 @@ PluginManager::vst_discover (string path)
        info->index = 0;
        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;
-       
-       _vst_plugin_info.push_back (info);
+
+       _vst_plugin_info->push_back (info);
        fst_free_info (finfo);
 
        return 0;
@@ -557,19 +621,144 @@ PluginManager::vst_discover (string path)
 
 #endif // VST_SUPPORT
 
-bool
-PluginManager::is_a_favorite_plugin (const PluginInfoPtr& pi)
+#ifdef LXVST_SUPPORT
+
+void
+PluginManager::lxvst_refresh ()
+{
+       if (_lxvst_plugin_info) {
+               _lxvst_plugin_info->clear ();
+       } else {
+               _lxvst_plugin_info = new ARDOUR::PluginInfoList();
+       }
+
+       if (lxvst_path.length() == 0) {
+               lxvst_path = "/usr/local/lib64/lxvst:/usr/local/lib/lxvst:/usr/lib64/lxvst:/usr/lib/lxvst";
+       }
+
+       lxvst_discover_from_path (lxvst_path);
+}
+
+int
+PluginManager::add_lxvst_directory (string path)
 {
-       FavoritePlugin fp (pi->type, pi->unique_id);
-       return find (favorites.begin(), favorites.end(), fp) !=  favorites.end();
+       if (lxvst_discover_from_path (path) == 0) {
+               lxvst_path += ':';
+               lxvst_path += path;
+               return 0;
+       }
+       return -1;
+}
+
+static bool lxvst_filter (const string& str, void *)
+{
+       /* Not a dotfile, has a prefix before a period, suffix is "so" */
+
+       return str[0] != '.' && (str.length() > 3 && str.find (".so") == (str.length() - 3));
+}
+
+int
+PluginManager::lxvst_discover_from_path (string path)
+{
+       PathScanner scanner;
+       vector<string *> *plugin_objects;
+       vector<string *>::iterator x;
+       int ret = 0;
+
+       DEBUG_TRACE (DEBUG::PluginManager, string_compose ("Discovering linuxVST plugins along %1\n", path));
+
+       plugin_objects = scanner (lxvst_path, lxvst_filter, 0, true, true);
+
+       if (plugin_objects) {
+               for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
+                       lxvst_discover (**x);
+               }
+       }
+
+       vector_delete (plugin_objects);
+       return ret;
+}
+
+int
+PluginManager::lxvst_discover (string path)
+{
+       VSTFXInfo* finfo;
+       char buf[32];
+
+       if ((finfo = vstfx_get_info (const_cast<char *> (path.c_str()))) == 0) {
+               warning << "Cannot get linuxVST information from " << path << endmsg;
+               return -1;
+       }
+
+       if (!finfo->canProcessReplacing) {
+               warning << string_compose (_("linuxVST plugin %1 does not support processReplacing, and so cannot be used in ardour at this time"),
+                                   finfo->name)
+                       << endl;
+       }
+
+       PluginInfoPtr info(new LXVSTPluginInfo);
+
+       if (!strcasecmp ("The Unnamed plugin", finfo->name)) {
+               info->name = PBD::basename_nosuffix (path);
+       } else {
+               info->name = finfo->name;
+       }
+
+       
+       snprintf (buf, sizeof (buf), "%d", finfo->UniqueID);
+       info->unique_id = buf;
+       info->category = "linuxVSTs";
+       info->path = path;
+       info->creator = finfo->creator;
+       info->index = 0;
+       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::LXVST;
+
+        /* Make sure we don't find the same plugin in more than one place along
+          the LXVST_PATH We can't use a simple 'find' because the path is included
+          in the PluginInfo, and that is the one thing we can be sure MUST be
+          different if a duplicate instance is found.  So we just compare the type
+          and unique ID (which for some VSTs isn't actually unique...)
+       */
+       
+       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)) {
+                               vstfx_free_info(finfo);
+                               return 0;
+                       }
+               }
+       }
+       
+       _lxvst_plugin_info->push_back (info);
+       vstfx_free_info (finfo);
+
+       return 0;
+}
+
+#endif // LXVST_SUPPORT
+
+
+PluginManager::PluginStatusType
+PluginManager::get_status (const PluginInfoPtr& pi)
+{
+       PluginStatus ps (pi->type, pi->unique_id);
+       PluginStatusList::const_iterator i =  find (statuses.begin(), statuses.end(), ps);
+       if (i ==  statuses.end() ) {
+               return Normal;
+       } else {
+               return i->status;
+       }
 }
 
 void
-PluginManager::save_favorites ()
+PluginManager::save_statuses ()
 {
        ofstream ofs;
        sys::path path = user_config_directory();
-       path /= "favorite_plugins";
+       path /= "plugin_statuses";
 
        ofs.open (path.to_string().c_str(), ios_base::openmode (ios::out|ios::trunc));
 
@@ -577,7 +766,7 @@ PluginManager::save_favorites ()
                return;
        }
 
-       for (FavoritePluginList::iterator i = favorites.begin(); i != favorites.end(); ++i) {
+       for (PluginStatusList::iterator i = statuses.begin(); i != statuses.end(); ++i) {
                switch ((*i).type) {
                case LADSPA:
                        ofs << "LADSPA";
@@ -591,28 +780,50 @@ PluginManager::save_favorites ()
                case VST:
                        ofs << "VST";
                        break;
+               case LXVST:
+                       ofs << "LXVST";
+                       break;
                }
-               
-               ofs << ' ' << (*i).unique_id << endl;
+
+               ofs << ' ';
+
+               switch ((*i).status) {
+               case Normal:
+                       ofs << "Normal";
+                       break;
+               case Favorite:
+                       ofs << "Favorite";
+                       break;
+               case Hidden:
+                       ofs << "Hidden";
+                       break;
+               }
+
+               ofs << ' ';
+               ofs << (*i).unique_id;;
+               ofs << endl;
        }
 
        ofs.close ();
 }
 
 void
-PluginManager::load_favorites ()
+PluginManager::load_statuses ()
 {
        sys::path path = user_config_directory();
-       path /= "favorite_plugins";
+       path /= "plugin_statuses";
        ifstream ifs (path.to_string().c_str());
 
        if (!ifs) {
                return;
        }
-       
+
        std::string stype;
+       std::string sstatus;
        std::string id;
        PluginType type;
+       PluginStatusType status;
+       char buf[1024];
 
        while (ifs) {
 
@@ -621,11 +832,33 @@ PluginManager::load_favorites ()
                        break;
 
                }
-               ifs >> id;
+
+               ifs >> sstatus;
+               if (!ifs) {
+                       break;
+
+               }
+
+               /* rest of the line is the plugin ID */
+
+               ifs.getline (buf, sizeof (buf), '\n');
                if (!ifs) {
                        break;
                }
 
+               if (sstatus == "Normal") {
+                       status = Normal;
+               } else if (sstatus == "Favorite") {
+                       status = Favorite;
+               } else if (sstatus == "Hidden") {
+                       status = Hidden;
+               } else {
+                       error << string_compose (_("unknown plugin status type \"%1\" - all entries ignored"), sstatus)
+                                 << endmsg;
+                       statuses.clear ();
+                       break;
+               }
+
                if (stype == "LADSPA") {
                        type = LADSPA;
                } else if (stype == "AudioUnit") {
@@ -634,29 +867,87 @@ PluginManager::load_favorites ()
                        type = LV2;
                } else if (stype == "VST") {
                        type = VST;
+               } else if (stype == "LXVST") {
+                       type = LXVST;
                } else {
-                       error << string_compose (_("unknown favorite plugin type \"%1\" - ignored"), stype)
+                       error << string_compose (_("unknown plugin type \"%1\" - ignored"), stype)
                              << endmsg;
                        continue;
                }
-               
-               add_favorite (type, id);
+
+               id = buf;
+               strip_whitespace_edges (id);
+               set_status (type, id, status);
        }
-       
+
        ifs.close ();
 }
 
 void
-PluginManager::add_favorite (PluginType t, string id)
+PluginManager::set_status (PluginType t, string id, PluginStatusType status)
+{
+       PluginStatus ps (t, id, status);
+       statuses.erase (ps);
+
+       if (status == Normal) {
+               return;
+       }
+
+       statuses.insert (ps);
+}
+
+ARDOUR::PluginInfoList&
+PluginManager::vst_plugin_info ()
 {
-       FavoritePlugin fp (t, id);
-       pair<FavoritePluginList::iterator,bool> res = favorites.insert (fp);
-       //cerr << "Added " << t << " " << id << " success ? " << res.second << endl;
+#ifdef VST_SUPPORT
+       if (!_vst_plugin_info)
+               vst_refresh();
+       return *_vst_plugin_info;
+#else
+       return _empty_plugin_info;
+#endif
 }
 
-void
-PluginManager::remove_favorite (PluginType t, string id)
+ARDOUR::PluginInfoList&
+PluginManager::lxvst_plugin_info ()
 {
-       FavoritePlugin fp (t, id);
-       favorites.erase (fp);
+#ifdef LXVST_SUPPORT
+       if (!_lxvst_plugin_info)
+               lxvst_refresh();
+       return *_lxvst_plugin_info;
+#else
+       return _empty_plugin_info;
+#endif
+}
+
+ARDOUR::PluginInfoList&
+PluginManager::ladspa_plugin_info ()
+{
+       if (!_ladspa_plugin_info)
+               ladspa_refresh();
+       return *_ladspa_plugin_info;
+}
+
+ARDOUR::PluginInfoList&
+PluginManager::lv2_plugin_info ()
+{
+#ifdef LV2_SUPPORT
+       if (!_lv2_plugin_info)
+               lv2_refresh();
+       return *_lv2_plugin_info;
+#else
+       return _empty_plugin_info;
+#endif
+}
+
+ARDOUR::PluginInfoList&
+PluginManager::au_plugin_info ()
+{
+#ifdef AUDIOUNIT_SUPPORT
+       if (!_au_plugin_info)
+               au_refresh();
+       return *_au_plugin_info;
+#else
+       return _empty_plugin_info;
+#endif
 }