diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 14:53:03 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 14:53:03 -0500 |
| commit | d15fda6d751a465d278f477923075d4783f3b1ca (patch) | |
| tree | 99e36ff934f50d9c980dbeab09ad021cda3d098c /libs/ardour/ardour/panner_manager.h | |
| parent | 22c303d8f6c355a7229eb459cedf4fbdf0eb3c1d (diff) | |
| parent | 0bdf4c25cfee8cf2408d2b1367f2c5e5c8c509b1 (diff) | |
fix merge errors with master
Diffstat (limited to 'libs/ardour/ardour/panner_manager.h')
| -rw-r--r-- | libs/ardour/ardour/panner_manager.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/ardour/panner_manager.h b/libs/ardour/ardour/panner_manager.h index e47ed36ec3..619beb454f 100644 --- 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(); |