merge (with conflict fixes) with master (even against rgareus' recommendation)

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

diff --git a/libs/ardour/ardour/panner_manager.h b/libs/ardour/ardour/panner_manager.h
index e47ed36ec38225b80313e258ca84f5fd28e41d62..73d667424f3a24f34292dcfd8a962dc35dc61d30 100644 (file)
--- a/libs/ardour/ardour/panner_manager.h
+++ b/libs/ardour/ardour/panner_manager.h
@@ -20,23 +20,29 @@
 #ifndef __ardour_panner_manager_h__
 #define __ardour_panner_manager_h__
 
-#include <dlfcn.h>
+#include <map>
+#include <string>
+#include <glibmm/module.h>
+
 #include "ardour/panner.h"
 #include "ardour/session_handle.h"
 
 namespace ARDOUR {
 
+typedef std::map<std::string,std::string> PannerUriMap;
+
 struct LIBARDOUR_API PannerInfo {
+
        PanPluginDescriptor descriptor;
-       void* module;
+       Glib::Module* module;
 
-       PannerInfo (PanPluginDescriptor& d, void* handle)
+       PannerInfo (PanPluginDescriptor& d, Glib::Module* m)
        : descriptor (d)
-       , module (handle)
+       , module (m)
        {}
 
        ~PannerInfo () {
-               dlclose (module);
+               delete module;
        }
 };
 
@@ -49,7 +55,9 @@ public:
        void discover_panners ();
        std::list<PannerInfo*> panner_info;
 
-       PannerInfo* select_panner (ChanCount in, ChanCount out);
+       PannerInfo* select_panner (ChanCount in, ChanCount out, std::string const uri = "");
+       PannerInfo* get_by_uri (std::string uri) const;
+       PannerUriMap get_available_panners(uint32_t const a_in, uint32_t const a_out) const;
 
 private:
        PannerManager();