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 d5b183c859237daa73376f2cfea7c8a7bd1186ae..73d667424f3a24f34292dcfd8a962dc35dc61d30 100644 (file)
--- a/libs/ardour/ardour/panner_manager.h
+++ b/libs/ardour/ardour/panner_manager.h
@@ -1,43 +1,70 @@
+/*
+    Copyright (C) 2012 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #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 {
 
-struct PannerInfo {
-    PanPluginDescriptor descriptor;
-    void* module;
-    
-    PannerInfo (PanPluginDescriptor& d, void* handle) 
-            : descriptor (d)
-            , module (handle)
-    {}
-    
-    ~PannerInfo () { 
-            dlclose (module);
-    }
+typedef std::map<std::string,std::string> PannerUriMap;
+
+struct LIBARDOUR_API PannerInfo {
+
+       PanPluginDescriptor descriptor;
+       Glib::Module* module;
+
+       PannerInfo (PanPluginDescriptor& d, Glib::Module* m)
+       : descriptor (d)
+       , module (m)
+       {}
+
+       ~PannerInfo () {
+               delete module;
+       }
 };
-        
-class PannerManager : public ARDOUR::SessionHandlePtr
+
+class LIBARDOUR_API PannerManager : public ARDOUR::SessionHandlePtr
 {
-  public:
-    ~PannerManager ();
-    static PannerManager& instance ();
-    
-    void discover_panners ();
-    std::list<PannerInfo*> panner_info;
-
-    PannerInfo* select_panner (ChanCount in, ChanCount out);
-    
-  private:
-    PannerManager();
-    static PannerManager* _instance;
-
-    PannerInfo* get_descriptor (std::string path);
-    int panner_discover (std::string path);
+public:
+       ~PannerManager ();
+       static PannerManager& instance ();
+
+       void discover_panners ();
+       std::list<PannerInfo*> panner_info;
+
+       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();
+       static PannerManager* _instance;
+
+       PannerInfo* get_descriptor (std::string path);
+       int panner_discover (std::string path);
 };
 
 } // namespace