fix merge conflict with master

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/rc_option_editor.cc
index 1286fd8cc9a63f6fdd5de54422b2d17ccb09511b,fc6978275772219a44170f25def153a96cf6733c..ccb0e5fcddaf4be56a343f7b50568ec769a41685
--- 1/gtk2_ardour/rc_option_editor.cc
--- 2/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@@ -35,10 -35,9 +35,11 @@@
  #include "ardour/dB.h"
  #include "ardour/rc_configuration.h"
  #include "ardour/control_protocol_manager.h"
+ #include "ardour/plugin_manager.h"
  #include "control_protocol/control_protocol.h"
  
 +#include "canvas/wave_view.h"
 +
  #include "ardour_window.h"
  #include "ardour_dialog.h"
  #include "gui_thread.h"

diff --cc gtk2_ardour/sfdb_ui.cc
Simple merge

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

diff --cc libs/ardour/ardour/auditioner.h
index 26e395f93ef3579d8cf0c7962868291cf80dd3a2,e73824b6693d2d1cc1b879ea8bc30eba4842e8a7..94d4eab4796025432e1f3e432352b48c2aa7a680
--- 1/libs/ardour/ardour/auditioner.h
--- 2/libs/ardour/ardour/auditioner.h
+++ b/libs/ardour/ardour/auditioner.h
@@@ -33,7 -37,7 +37,7 @@@ class Session
  class AudioRegion;
  class AudioPlaylist;
  
- class LIBARDOUR_API Auditioner : public AudioTrack
 -class Auditioner : public Track
++class LIBARDOUR_API Auditioner : public Track
  {
    public:
        Auditioner (Session&);

diff --cc libs/ardour/ardour/internal_send.h
index 9bfbc4c659e150df8a2d1dc34ba06ab0f10faf9e,ea3d645754f668871e8215007c28c8f8e57993ba..a06bf399065a8c646712813d78a6c702662795b6
--- 1/libs/ardour/ardour/internal_send.h
--- 2/libs/ardour/ardour/internal_send.h
+++ b/libs/ardour/ardour/internal_send.h
@@@ -25,10 -25,10 +25,10 @@@
  
  namespace ARDOUR {
  
 -class InternalSend : public Send
 +class LIBARDOUR_API InternalSend : public Send
  {
    public:
-       InternalSend (Session&, boost::shared_ptr<Pannable>, boost::shared_ptr<MuteMaster>, boost::shared_ptr<Route> send_to, Delivery::Role role);
+       InternalSend (Session&, boost::shared_ptr<Pannable>, boost::shared_ptr<MuteMaster>, boost::shared_ptr<Route> send_to, Delivery::Role role = Delivery::Aux, bool ignore_bitslot = false);
        virtual ~InternalSend ();
  
        std::string display_name() const;

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

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

diff --cc libs/ardour/ardour/send.h
index 9b30dcf792800c136818e5841e590cac541e882e,6e2775286daea24d5de0de712ea1b1e4c8838b2c..a9d2c5dacd2574555ecffba56052303b5083f3ec
--- 1/libs/ardour/ardour/send.h
--- 2/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@@ -32,10 -32,10 +32,10 @@@ namespace ARDOUR 
  class PeakMeter;
  class Amp;
  
 -class Send : public Delivery
 +class LIBARDOUR_API Send : public Delivery
  {
    public:
-       Send (Session&, boost::shared_ptr<Pannable> pannable, boost::shared_ptr<MuteMaster>, Delivery::Role r = Delivery::Send);
+       Send (Session&, boost::shared_ptr<Pannable> pannable, boost::shared_ptr<MuteMaster>, Delivery::Role r = Delivery::Send, bool ignore_bitslot = false);
        virtual ~Send ();
  
        uint32_t bit_slot() const { return _bitslot; }

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

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

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

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

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

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

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

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