fix merge errors with master

[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..619beb454f5681073d8ddf67281c0684bf793c6c 100644 (file)
--- a/libs/ardour/ardour/panner_manager.h
+++ b/libs/ardour/ardour/panner_manager.h
@@ -49,7 +49,8 @@ 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);
 
 private:
        PannerManager();