Merge branch 'master' into windows

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

diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h
index 9ba3d8324e1696d308c933c49b0301da037736b9..2464368ae7b84b31bbd47ac09f4532178961beaf 100644 (file)
--- a/libs/ardour/ardour/plugin_manager.h
+++ b/libs/ardour/ardour/plugin_manager.h
@@ -39,20 +39,20 @@ class Plugin;
 
 class PluginManager : public boost::noncopyable {
   public:
-       PluginManager ();
+       static PluginManager& instance();
+
        ~PluginManager ();
 
-       ARDOUR::PluginInfoList &vst_plugin_info ();
+       ARDOUR::PluginInfoList &windows_vst_plugin_info ();
+       ARDOUR::PluginInfoList &lxvst_plugin_info ();
        ARDOUR::PluginInfoList &ladspa_plugin_info ();
        ARDOUR::PluginInfoList &lv2_plugin_info ();
        ARDOUR::PluginInfoList &au_plugin_info ();
 
        void refresh ();
 
-       int add_ladspa_directory (std::string dirpath);
-       int add_vst_directory (std::string dirpath);
-
-       static PluginManager* the_manager() { return _manager; }
+       int add_windows_vst_directory (std::string dirpath);
+       int add_lxvst_directory (std::string dirpath);
 
        enum PluginStatusType {
                Normal = 0,
@@ -94,38 +94,44 @@ class PluginManager : public boost::noncopyable {
        PluginStatusList statuses;
 
        ARDOUR::PluginInfoList  _empty_plugin_info;
-       ARDOUR::PluginInfoList* _vst_plugin_info;
+       ARDOUR::PluginInfoList* _windows_vst_plugin_info;
+       ARDOUR::PluginInfoList* _lxvst_plugin_info;
        ARDOUR::PluginInfoList* _ladspa_plugin_info;
        ARDOUR::PluginInfoList* _lv2_plugin_info;
        ARDOUR::PluginInfoList* _au_plugin_info;
 
        std::map<uint32_t, std::string> rdf_type;
 
-       std::string ladspa_path;
-       std::string vst_path;
+       std::string windows_vst_path;
+       std::string lxvst_path;
 
        void ladspa_refresh ();
-       void vst_refresh ();
+       void windows_vst_refresh ();
+       void lxvst_refresh ();
 
        void add_lrdf_data (const std::string &path);
        void add_ladspa_presets ();
-       void add_vst_presets ();
+       void add_windows_vst_presets ();
+       void add_lxvst_presets ();
        void add_presets (std::string domain);
 
        void au_refresh ();
 
        void lv2_refresh ();
 
-       int vst_discover_from_path (std::string path);
-       int vst_discover (std::string path);
+       int windows_vst_discover_from_path (std::string path);
+       int windows_vst_discover (std::string path);
+       
+       int lxvst_discover_from_path (std::string path);
+       int lxvst_discover (std::string path);
 
-       int ladspa_discover_from_path (std::string path);
        int ladspa_discover (std::string path);
 
        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 */