merge (with conflict fixes) with master (even against rgareus' recommendation)

diff --cc gtk2_ardour/mixer_strip.cc
Simple merge

diff --cc gtk2_ardour/panner_ui.cc
Simple merge

diff --cc gtk2_ardour/processor_box.cc
index 1e2289d790ecc17446f6677a0fed20a134528889,c2421dcabf560cd822750a8165dc438d8204e974..05a373e9d8a01a6df91f73b96c7ed057e0a56f91
--- 1/gtk2_ardour/processor_box.cc
--- 2/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@@ -45,8 -45,8 +45,9 @@@
  #include "ardour/audioengine.h"
  #include "ardour/internal_return.h"
  #include "ardour/internal_send.h"
+ #include "ardour/panner_shell.h"
  #include "ardour/plugin_insert.h"
 +#include "ardour/pannable.h"
  #include "ardour/port_insert.h"
  #include "ardour/profile.h"
  #include "ardour/return.h"
@@@ -2069,9 -2109,8 +2112,10 @@@ ProcessorBox::paste_processor_state (co
  
                        } else if (type->value() == "send") {
  
 +                              boost::shared_ptr<Pannable> sendpan(new Pannable (*_session));
                                XMLNode n (**niter);
-                               Send* s = new Send (*_session, sendpan, _route->mute_master());
++
+                               Send* s = new Send (*_session, _route->pannable(), _route->mute_master());
  
                                IOProcessor::prepare_for_reset (n, s->name());
                                

diff --cc gtk2_ardour/rc_option_editor.cc
Simple merge

diff --cc gtk2_ardour/send_ui.cc
Simple merge

diff --cc libs/ardour/ardour/panner_manager.h
index 80f8e8010a391b085aa93c367e759383be2363e7,4a29e1c36b59841da32faf6b0c4aff4beb05a899..73d667424f3a24f34292dcfd8a962dc35dc61d30
--- 1/libs/ardour/ardour/panner_manager.h
--- 2/libs/ardour/ardour/panner_manager.h
+++ b/libs/ardour/ardour/panner_manager.h
@@@ -20,20 -20,21 +20,25 @@@
  #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 {
+ typedef std::map<std::string,std::string> PannerUriMap;
+ 
 +struct LIBARDOUR_API PannerInfo {
++
        PanPluginDescriptor descriptor;
 -      void* module;
 +      Glib::Module* module;
  
 -      PannerInfo (PanPluginDescriptor& d, void* handle)
 +      PannerInfo (PanPluginDescriptor& d, Glib::Module* m)
        : descriptor (d)
 -      , module (handle)
 +      , module (m)
        {}
  
        ~PannerInfo () {

diff --cc libs/ardour/ardour/panner_shell.h
index 76df20489f45483e506d418a45d9cb4e7943b657,60db264b4da6634ba3682250f425f0ab43bc08c7..02f80c7b28bc0db237c6d298593055270f407897
--- 1/libs/ardour/ardour/panner_shell.h
--- 2/libs/ardour/ardour/panner_shell.h
+++ b/libs/ardour/ardour/panner_shell.h
@@@ -47,10 -46,10 +47,10 @@@ class Pannable
  /** Class to manage panning by instantiating and controlling
   *  an appropriate Panner object for a given in/out configuration.
   */
 -class PannerShell : public SessionObject
 +class LIBARDOUR_API PannerShell : public SessionObject
  {
  public:
-       PannerShell (std::string name, Session&, boost::shared_ptr<Pannable>);
+       PannerShell (std::string name, Session&, boost::shared_ptr<Pannable>, bool is_send = false);
        virtual ~PannerShell ();
  
        std::string describe_parameter (Evoral::Parameter param);

diff --cc libs/ardour/ardour/rc_configuration_vars.h
Simple merge

diff --cc libs/ardour/panner_manager.cc
Simple merge

diff --cc libs/ardour/route.cc
index 1b40df24dd830dfe8a6aa87b500265232a59274f,a2176e8d45622ad0115d0c08562981e04055fbdf..6279dbacf6dcfa9b90f99773db81a50774dba4f4
--- 1/libs/ardour/route.cc
--- 2/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@@ -2570,8 -2568,8 +2574,7 @@@ Route::set_processor_state (const XMLNo
  
                                } else if (prop->value() == "send") {
  
--                                      boost::shared_ptr<Pannable> sendpan (new Pannable (_session));
-                                       processor.reset (new Send (_session, sendpan, _mute_master));
+                                       processor.reset (new Send (_session, _pannable, _mute_master));
  
                                } else {
                                        error << string_compose(_("unknown Processor type \"%1\"; ignored"), prop->value()) << endmsg;

diff --cc libs/panners/vbap/vbap.cc
Simple merge