diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-14 10:56:17 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-14 10:56:17 -0500 |
commit | cf806123ca5faaef483f898daba3f7bd38ec62eb (patch) | |
tree | f11f2f9ff64ea3b3682c81b8dd893ba0e9476445 /libs/ardour/ardour/panner_manager.h | |
parent | cfc9a1f22ea38d4dd6c619d6cec25fe29b1c2f48 (diff) | |
parent | d9296b71237d9d3058b0796eda25258fadd45ad9 (diff) |
merge (with conflict fixes) with master (even against rgareus' recommendation)
Diffstat (limited to 'libs/ardour/ardour/panner_manager.h')
-rw-r--r-- | libs/ardour/ardour/panner_manager.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libs/ardour/ardour/panner_manager.h b/libs/ardour/ardour/panner_manager.h index 80f8e8010a..73d667424f 100644 --- 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 { +typedef std::map<std::string,std::string> PannerUriMap; + struct LIBARDOUR_API PannerInfo { + PanPluginDescriptor descriptor; Glib::Module* module; @@ -51,7 +56,8 @@ public: std::list<PannerInfo*> panner_info; PannerInfo* select_panner (ChanCount in, ChanCount out, std::string const uri = ""); - PannerInfo* get_by_uri (std::string 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(); |