Use LV2_SUPPORT define instead of HAVE_SLV2.

[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 44c529835e6d5952822da693365d2281598f1881..2d60bf53f6134d45875d6b6c0f14d68af40092ae 100644 (file)
--- a/libs/ardour/ardour/plugin_manager.h
+++ b/libs/ardour/ardour/plugin_manager.h
@@ -33,7 +33,7 @@
 #include "ardour/types.h"
 #include "ardour/plugin.h"
 
-#ifdef HAVE_SLV2
+#ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
 #endif
 
@@ -56,6 +56,10 @@ class PluginManager : public boost::noncopyable {
        int add_ladspa_directory (std::string dirpath);
        int add_vst_directory (std::string dirpath);
 
+#ifdef LV2_SUPPORT
+       LV2World* lv2_world() { return _lv2_world; }
+#endif
+
        static PluginManager* the_manager() { return _manager; }
 
        enum PluginStatusType {
@@ -70,7 +74,7 @@ class PluginManager : public boost::noncopyable {
        PluginStatusType get_status (const PluginInfoPtr&);
 
        /** plugins were added to or removed from one of the PluginInfoLists */
-       boost::signals2::signal<void()> PluginListChanged;
+       PBD::Signal0<void> PluginListChanged;
 
   private:
        struct PluginStatus {
@@ -86,7 +90,12 @@ class PluginManager : public boost::noncopyable {
            }
 
            bool operator<(const PluginStatus& other) const {
-                   return other.type < type || other.unique_id < unique_id;
+                   if (other.type < type) {
+                           return true;
+                   } else if (other.type == type && other.unique_id < unique_id) {
+                           return true;
+                   }
+                   return false;
            }
        };
        typedef std::set<PluginStatus> PluginStatusList;
@@ -98,7 +107,7 @@ class PluginManager : public boost::noncopyable {
        ARDOUR::PluginInfoList* _lv2_plugin_info;
        ARDOUR::PluginInfoList* _au_plugin_info;
 
-#ifdef HAVE_SLV2
+#ifdef LV2_SUPPORT
        LV2World* _lv2_world;
 #endif