remove offset from process callback tree. some breakage may have occured. yes, really.

[ardour.git] / libs / ardour / panner.cc

diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index 0bd40d9e459dfcd81ed74914e8dffc43505e337d..a00edfdd3f468730cab0e63a96a5158d8459c402 100644 (file)
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -32,25 +32,25 @@
 
 #include <glibmm.h>
 
-#include <pbd/error.h>
-#include <pbd/failed_constructor.h>
-#include <pbd/xml++.h>
-#include <pbd/enumwriter.h>
+#include "pbd/error.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/xml++.h"
+#include "pbd/enumwriter.h"
 
-#include <evoral/Curve.hpp>
+#include "evoral/Curve.hpp"
 
-#include <ardour/session.h>
-#include <ardour/panner.h>
-#include <ardour/utils.h>
-#include <ardour/audio_buffer.h>
+#include "ardour/session.h"
+#include "ardour/panner.h"
+#include "ardour/utils.h"
+#include "ardour/audio_buffer.h"
 
-#include <ardour/runtime_functions.h>
-#include <ardour/buffer_set.h>
-#include <ardour/audio_buffer.h>
+#include "ardour/runtime_functions.h"
+#include "ardour/buffer_set.h"
+#include "ardour/audio_buffer.h"
 
 #include "i18n.h"
 
-#include <pbd/mathfix.h>
+#include "pbd/mathfix.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -897,7 +897,7 @@ void
 Panner::remove (uint32_t which)
 {
        vector<StreamPanner*>::iterator i;
-       for (i = _streampanners.begin(); i != _streampanners.end() && which; ++i, --which);
+       for (i = _streampanners.begin(); i != _streampanners.end() && which; ++i, --which) {}
 
        if (i != _streampanners.end()) {
                delete *i;
@@ -1267,7 +1267,7 @@ Panner::set_position (float xpos, float ypos, float zpos, StreamPanner& orig)
 }
 
 void
-Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes_t nframes, nframes_t offset, gain_t gain_coeff)
+Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes_t nframes, gain_t gain_coeff)
 {
        if (outbufs.count().n_audio() == 0) {
                // Don't want to lose audio...
@@ -1288,37 +1288,37 @@ Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes
 
                        /* only one output, and gain was zero, so make it silent */
 
-                       dst.silence(offset);
+                       dst.silence (nframes);
                        
                } else if (gain_coeff == 1.0f){
 
                        /* mix all buffers into the output */
 
                        // copy the first
-                       dst.read_from(inbufs.get_audio(0), nframes, offset);
+                       dst.read_from(inbufs.get_audio(0), nframes);
                        
                        // accumulate starting with the second
-            if (inbufs.count().n_audio() > 0) {
-                BufferSet::audio_iterator i = inbufs.audio_begin();
-                for (++i; i != inbufs.audio_end(); ++i) {
-                    dst.accumulate_from(*i, nframes, offset);
-                }
-            }
+                       if (inbufs.count().n_audio() > 0) {
+                               BufferSet::audio_iterator i = inbufs.audio_begin();
+                               for (++i; i != inbufs.audio_end(); ++i) {
+                                       dst.accumulate_from(*i, nframes);
+                               }
+                       }
 
                } else {
 
                        /* mix all buffers into the output, scaling them all by the gain */
 
                        // copy the first
-                       dst.read_from(inbufs.get_audio(0), nframes, offset);
+                       dst.read_from(inbufs.get_audio(0), nframes);
                        
                        // accumulate (with gain) starting with the second
-            if (inbufs.count().n_audio() > 0) {
-                       BufferSet::audio_iterator i = inbufs.audio_begin();
-                           for (++i; i != inbufs.audio_end(); ++i) {
-                               dst.accumulate_with_gain_from(*i, nframes, offset, gain_coeff);
-                       }
-            }
+                       if (inbufs.count().n_audio() > 0) {
+                               BufferSet::audio_iterator i = inbufs.audio_begin();
+                               for (++i; i != inbufs.audio_end(); ++i) {
+                                       dst.accumulate_with_gain_from(*i, nframes, gain_coeff);
+                               }
+                       }
 
                }
 
@@ -1327,7 +1327,7 @@ Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes
        
        /* the terrible silence ... */
        for (BufferSet::audio_iterator i = outbufs.audio_begin(); i != outbufs.audio_end(); ++i) {
-               i->silence(nframes, offset);
+               i->silence(nframes);
        }
 
        BufferSet::audio_iterator i = inbufs.audio_begin();
@@ -1338,7 +1338,7 @@ Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes
 }
 
 void
-Panner::run_out_of_place (BufferSet& inbufs, BufferSet& outbufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset)
+Panner::run_out_of_place (BufferSet& inbufs, BufferSet& outbufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes)
 {      
        if (outbufs.count().n_audio() == 0) {
                // Failing to deliver audio we were asked to deliver is a bug
@@ -1360,7 +1360,7 @@ Panner::run_out_of_place (BufferSet& inbufs, BufferSet& outbufs, nframes_t start
                        gain_coeff = speed_quietning;
                }
 
-               distribute_no_automation(inbufs, outbufs, nframes, offset, gain_coeff);
+               distribute_no_automation(inbufs, outbufs, nframes, gain_coeff);
                return;
        }
 
@@ -1373,12 +1373,12 @@ Panner::run_out_of_place (BufferSet& inbufs, BufferSet& outbufs, nframes_t start
                // FIXME: apply gain automation?
 
                // copy the first
-               dst.read_from(inbufs.get_audio(0), nframes, offset);
+               dst.read_from(inbufs.get_audio(0), nframes);
 
                // accumulate starting with the second
                BufferSet::audio_iterator i = inbufs.audio_begin();
                for (++i; i != inbufs.audio_end(); ++i) {
-                       dst.accumulate_from(*i, nframes, offset);
+                       dst.accumulate_from(*i, nframes);
                }
 
                return;
@@ -1389,7 +1389,7 @@ Panner::run_out_of_place (BufferSet& inbufs, BufferSet& outbufs, nframes_t start
        
        /* the terrible silence ... */
        for (BufferSet::audio_iterator i = outbufs.audio_begin(); i != outbufs.audio_end(); ++i) {
-               i->silence(nframes, offset);
+               i->silence(nframes);
        }
 
        BufferSet::audio_iterator i = inbufs.audio_begin();