monitor send gets access to the (shared) pannable of the track/bus, thus ensuring that the monitor feed is panned. required a few fixes along the way

git-svn-id: svn://localhost/ardour2/branches/3.0@9731 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 2 deletions

diff --git a/libs/panners/2in2out/panner_2in2out.cc b/libs/panners/2in2out/panner_2in2out.cc
index df859a1eff..0c5184efe6 100644
--- a/libs/panners/2in2out/panner_2in2out.cc
+++ b/libs/panners/2in2out/panner_2in2out.cc
@@ -49,6 +49,7 @@
 #include "ardour/runtime_functions.h"
 #include "ardour/session.h"
 #include "ardour/utils.h"
+#include "ardour/mix.h"
 
 #include "panner_2in2out.h"
 
@@ -269,7 +270,8 @@ Panner2in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai
 			if (pan != 0.0f) {
 
 				/* pan is 1 but also not 0, so we must do it "properly" */
-
+				
+				//obufs.get_audio(1).read_from (srcbuf, nframes);
 				mix_buffers_with_gain(dst,src,nframes,pan);
 
 				/* mark that we wrote into the buffer */
@@ -328,7 +330,8 @@ Panner2in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai
 				/* pan is not 1 but also not 0, so we must do it "properly" */
 				
 				mix_buffers_with_gain(dst,src,nframes,pan);
-
+				// obufs.get_audio(1).read_from (srcbuf, nframes);
+				
 				/* XXX it would be nice to mark the buffer as written to */
 			}