fix merge errors with master

4 files changed, 19 insertions, 1 deletions

diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index cee59923ef..47b102989b 100644
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -175,8 +175,11 @@ protected:
 extern "C" {
 struct LIBARDOUR_API PanPluginDescriptor {
 	std::string name;
+	std::string panner_uri;
+	std::string gui_uri;
 	int32_t in;
 	int32_t out;
+	uint32_t priority;
 	ARDOUR::Panner* (*factory)(boost::shared_ptr<ARDOUR::Pannable>, boost::shared_ptr<ARDOUR::Speakers>);
 };
 }
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();
diff --git a/libs/ardour/ardour/panner_shell.h b/libs/ardour/ardour/panner_shell.h
index b78573212a..76df20489f 100644
--- a/libs/ardour/ardour/panner_shell.h
+++ b/libs/ardour/ardour/panner_shell.h
@@ -37,6 +37,7 @@
 namespace ARDOUR {
 
 class Session;
+class Route;
 class Panner;
 class BufferSet;
 class AudioBuffer;
@@ -71,11 +72,23 @@ public:
 	bool bypassed () const;
 	void set_bypassed (bool);
 
+	std::string current_panner_uri() const { return _current_panner_uri; }
+	std::string user_selected_panner_uri() const { return _user_selected_panner_uri; }
+	std::string panner_gui_uri() const { return _panner_gui_uri; }
+
   private:
+	friend class Route;
 	void distribute_no_automation (BufferSet& src, BufferSet& dest, pframes_t nframes, gain_t gain_coeff);
+	bool set_user_selected_panner_uri (std::string const uri);
+
 	boost::shared_ptr<Panner> _panner;
 	boost::shared_ptr<Pannable> _pannable;
 	bool _bypassed;
+
+	std::string _current_panner_uri;
+	std::string _user_selected_panner_uri;
+	std::string _panner_gui_uri;
+	bool _force_reselect;
 };
 
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index fb2b18f177..5cd17ee24e 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -256,6 +256,7 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou
 	int remove_processor (boost::shared_ptr<Processor>, ProcessorStreams* err = 0, bool need_process_lock = true);
 	int remove_processors (const ProcessorList&, ProcessorStreams* err = 0);
 	int reorder_processors (const ProcessorList& new_order, ProcessorStreams* err = 0);
+	void set_custom_panner_uri (std::string const panner_uri);
 	void disable_processors (Placement);
 	void disable_processors ();
 	void disable_plugins (Placement);