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 c34d22285d2a5210d77f21459d855865b2da0cc3..73d667424f3a24f34292dcfd8a962dc35dc61d30 100644 (file)
--- a/libs/ardour/ardour/panner_manager.h
+++ b/libs/ardour/ardour/panner_manager.h
@@ -20,6 +20,8 @@
 #ifndef __ardour_panner_manager_h__
 #define __ardour_panner_manager_h__
 
+#include <map>
+#include <string>
 #include <glibmm/module.h>
 
 #include "ardour/panner.h"
@@ -27,7 +29,10 @@
 
 namespace ARDOUR {
 
-struct PannerInfo {
+typedef std::map<std::string,std::string> PannerUriMap;
+
+struct LIBARDOUR_API PannerInfo {
+
        PanPluginDescriptor descriptor;
        Glib::Module* module;
 
@@ -41,7 +46,7 @@ struct PannerInfo {
        }
 };
 
-class PannerManager : public ARDOUR::SessionHandlePtr
+class LIBARDOUR_API PannerManager : public ARDOUR::SessionHandlePtr
 {
 public:
        ~PannerManager ();
@@ -50,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();