Add mono switch to mixer strips (mantis 1068)
[ardour.git] / libs / ardour / panner.cc
index 0bd40d9e459dfcd81ed74914e8dffc43505e337d..6c8dc153bbb8e2ad83b9ad61135743ef09cd4b54 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2004 Paul Davis 
+    Copyright (C) 2004 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 #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;
@@ -62,15 +62,15 @@ string EqualPowerStereoPanner::name = "Equal Power Stereo";
 string Multi2dPanner::name = "Multiple (2D)";
 
 /* this is a default mapper of  control values to a pan position
-   others can be imagined. 
+   others can be imagined.
 */
 
-static pan_t direct_control_to_pan (double fract) { 
+static pan_t direct_control_to_pan (double fract) {
        return fract;
 }
 
 
-//static double direct_pan_to_control (pan_t val) { 
+//static double direct_pan_to_control (pan_t val) {
 //     return val;
 //}
 
@@ -80,9 +80,10 @@ StreamPanner::StreamPanner (Panner& p, Evoral::Parameter param)
        assert(param.type() != NullAutomation);
 
        _muted = false;
+       _mono = false;
 
        _control = boost::dynamic_pointer_cast<AutomationControl>( parent.control( param, true ) );
-       
+
        x = 0.5;
        y = 0.5;
        z = 0.5;
@@ -92,6 +93,15 @@ StreamPanner::~StreamPanner ()
 {
 }
 
+void
+StreamPanner::set_mono (bool yn)
+{
+       if (yn != _mono) {
+               _mono = yn;
+               StateChanged ();
+       }
+}
+
 void
 Panner::PanControllable::set_value (float val)
 {
@@ -137,7 +147,7 @@ StreamPanner::set_position (float xpos, float ypos, bool link_call)
        }
 
        if (x != xpos || y != ypos) {
-               
+
                x = xpos;
                y = ypos;
                update ();
@@ -162,13 +172,13 @@ StreamPanner::set_position (float xpos, float ypos, float zpos, bool link_call)
 }
 
 int
-StreamPanner::set_state (const XMLNode& node)
+StreamPanner::set_state (const XMLNode& node, int version)
 {
        const XMLProperty* prop;
        XMLNodeConstIterator iter;
 
        if ((prop = node.property (X_("muted")))) {
-               set_muted (prop->value() == "yes");
+               set_muted (string_is_affirmative (prop->value()));
        }
 
        return 0;
@@ -180,6 +190,39 @@ StreamPanner::add_state (XMLNode& node)
        node.add_property (X_("muted"), (muted() ? "yes" : "no"));
 }
 
+void
+StreamPanner::distribute (AudioBuffer& src, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes)
+{
+       if (_mono) {
+               /* we're in mono mode, so just pan the input to all outputs equally */
+               int const N = parent.nouts ();
+               for (int i = 0; i < N; ++i) {
+                       mix_buffers_with_gain (obufs.get_audio(i).data(), src.data(), nframes, gain_coeff);
+               }
+       } else {
+               /* normal mode, call the `real' distribute method */
+               do_distribute (src, obufs, gain_coeff, nframes);
+       }
+}
+
+void
+StreamPanner::distribute_automated (AudioBuffer& src, BufferSet& obufs,
+                                   nframes_t start, nframes_t end, nframes_t nframes, pan_t** buffers)
+{
+       if (_mono) {
+               /* we're in mono mode, so just pan the input to all outputs equally */
+               int const N = parent.nouts ();
+               for (int i = 0; i < N; ++i) {
+                       mix_buffers_with_gain (obufs.get_audio(i).data(), src.data(), nframes, 1.0);
+               }
+       } else {
+               /* normal mode, call the `real' distribute method */
+               do_distribute_automated (src, obufs, start, end, nframes, buffers);
+       }
+       
+}
+
+
 /*---------------------------------------------------------------------- */
 
 BaseStereoPanner::BaseStereoPanner (Panner& p, Evoral::Parameter param)
@@ -196,7 +239,7 @@ BaseStereoPanner::load (istream& in, string path, uint32_t& linecnt)
 {
        char line[128];
        LocaleGuard lg (X_("POSIX"));
-       
+
        _control->list()->clear ();
 
        while (in.getline (line, sizeof (line), '\n')) {
@@ -225,7 +268,7 @@ BaseStereoPanner::load (istream& in, string path, uint32_t& linecnt)
 }
 
 void
-BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes)
+BaseStereoPanner::do_distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes)
 {
        assert(obufs.count().n_audio() == 2);
 
@@ -236,55 +279,62 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain
        if (_muted) {
                return;
        }
-       
+
        Sample* const src = srcbuf.data();
 
        /* LEFT */
 
        dst = obufs.get_audio(0).data();
 
-       if (fabsf ((delta = (left - desired_left))) > 0.002) { // about 1 degree of arc 
-               
-               /* interpolate over 64 frames or nframes, whichever is smaller */
-               
-               nframes_t limit = min ((nframes_t)64, nframes);
+       if (fabsf ((delta = (left - desired_left))) > 0.002) { // about 1 degree of arc
+
+               /* we've moving the pan by an appreciable amount, so we must
+                  interpolate over 64 frames or nframes, whichever is smaller */
+
+               nframes_t const limit = min ((nframes_t)64, nframes);
                nframes_t n;
 
                delta = -(delta / (float) (limit));
-               
+
                for (n = 0; n < limit; n++) {
                        left_interp = left_interp + delta;
                        left = left_interp + 0.9 * (left - left_interp);
                        dst[n] += src[n] * left * gain_coeff;
                }
-               
+
+               /* then pan the rest of the buffer; no need for interpolation for this bit */
+
                pan = left * gain_coeff;
 
                mix_buffers_with_gain (dst+n,src+n,nframes-n,pan);
-               
+
        } else {
-               
+
                left = desired_left;
                left_interp = left;
 
                if ((pan = (left * gain_coeff)) != 1.0f) {
-                       
+
                        if (pan != 0.0f) {
-                               
+
+                               /* pan is 1 but also not 0, so we must do it "properly" */
+
                                mix_buffers_with_gain(dst,src,nframes,pan);
 
                                /* mark that we wrote into the buffer */
 
                                // obufs[0] = 0;
 
-                       } 
-                       
+                       }
+
                } else {
-                       
+
+                       /* pan is 1 so we can just copy the input samples straight in */
+
                        mix_buffers_no_gain(dst,src,nframes);
-                       
+
                        /* mark that we wrote into the buffer */
-                       
+
                        // obufs[0] = 0;
                }
        }
@@ -292,12 +342,13 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain
        /* RIGHT */
 
        dst = obufs.get_audio(1).data();
-       
-       if (fabsf ((delta = (right - desired_right))) > 0.002) { // about 1 degree of arc 
-               
-               /* interpolate over 64 frames or nframes, whichever is smaller */
-               
-               nframes_t limit = min ((nframes_t)64, nframes);
+
+       if (fabsf ((delta = (right - desired_right))) > 0.002) { // about 1 degree of arc
+
+               /* we're moving the pan by an appreciable amount, so we must
+                  interpolate over 64 frames or nframes, whichever is smaller */
+
+               nframes_t const limit = min ((nframes_t)64, nframes);
                nframes_t n;
 
                delta = -(delta / (float) (limit));
@@ -307,31 +358,37 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain
                        right = right_interp + 0.9 * (right - right_interp);
                        dst[n] += src[n] * right * gain_coeff;
                }
-               
+
+               /* then pan the rest of the buffer, no need for interpolation for this bit */
+
                pan = right * gain_coeff;
-               
+
                mix_buffers_with_gain(dst+n,src+n,nframes-n,pan);
-               
+
                /* XXX it would be nice to mark the buffer as written to */
 
        } else {
 
                right = desired_right;
                right_interp = right;
-               
+
                if ((pan = (right * gain_coeff)) != 1.0f) {
-                       
+
                        if (pan != 0.0f) {
+
+                               /* pan is not 1 but also not 0, so we must do it "properly" */
                                
                                mix_buffers_with_gain(dst,src,nframes,pan);
-                               
+
                                /* XXX it would be nice to mark the buffer as written to */
                        }
-                       
+
                } else {
+
+                       /* pan is 1 so we can just copy the input samples straight in */
                        
                        mix_buffers_no_gain(dst,src,nframes);
-                       
+
                        /* XXX it would be nice to mark the buffer as written to */
                }
        }
@@ -358,9 +415,9 @@ void
 EqualPowerStereoPanner::update ()
 {
        /* it would be very nice to split this out into a virtual function
-          that can be accessed from BaseStereoPanner and used in distribute_automated().
-          
-          but the place where its used in distribute_automated() is a tight inner loop,
+          that can be accessed from BaseStereoPanner and used in do_distribute_automated().
+
+          but the place where its used in do_distribute_automated() is a tight inner loop,
           and making "nframes" virtual function calls to compute values is an absurd
           overhead.
        */
@@ -374,7 +431,7 @@ EqualPowerStereoPanner::update ()
 
        const float pan_law_attenuation = -3.0f;
        const float scale = 2.0f - 4.0f * powf (10.0f,pan_law_attenuation/20.0f);
-       
+
        desired_left = panL * (scale * panL + 1.0f - scale);
        desired_right = panR * (scale * panR + 1.0f - scale);
 
@@ -383,9 +440,9 @@ EqualPowerStereoPanner::update ()
 }
 
 void
-EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& obufs, 
-                                             nframes_t start, nframes_t end, nframes_t nframes,
-                                             pan_t** buffers)
+EqualPowerStereoPanner::do_distribute_automated (AudioBuffer& srcbuf, BufferSet& obufs,
+                                                nframes_t start, nframes_t end, nframes_t nframes,
+                                                pan_t** buffers)
 {
        assert(obufs.count().n_audio() == 2);
 
@@ -398,7 +455,7 @@ EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& ob
        if (!_control->list()->curve().rt_safe_get_vector (start, end, buffers[0], nframes)) {
                /* fallback */
                if (!_muted) {
-                       distribute (srcbuf, obufs, 1.0, nframes);
+                       do_distribute (srcbuf, obufs, 1.0, nframes);
                }
                return;
        }
@@ -424,7 +481,7 @@ EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& ob
 
                float panR = buffers[0][n];
                float panL = 1 - panR;
-               
+
                buffers[0][n] = panL * (scale * panL + 1.0f - scale);
                buffers[1][n] = panR * (scale * panR + 1.0f - scale);
        }
@@ -433,10 +490,10 @@ EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& ob
 
        dst = obufs.get_audio(0).data();
        pbuf = buffers[0];
-       
+
        for (nframes_t n = 0; n < nframes; ++n) {
                dst[n] += src[n] * pbuf[n];
-       }       
+       }
 
        /* XXX it would be nice to mark the buffer as written to */
 
@@ -447,8 +504,8 @@ EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& ob
 
        for (nframes_t n = 0; n < nframes; ++n) {
                dst[n] += src[n] * pbuf[n];
-       }       
-       
+       }
+
        /* XXX it would be nice to mark the buffer as written to */
 }
 
@@ -465,13 +522,13 @@ EqualPowerStereoPanner::get_state (void)
 }
 
 XMLNode&
-EqualPowerStereoPanner::state (bool full_state)
+EqualPowerStereoPanner::state (bool /*full_state*/)
 {
        XMLNode* root = new XMLNode ("StreamPanner");
        char buf[64];
        LocaleGuard lg (X_("POSIX"));
 
-       snprintf (buf, sizeof (buf), "%.12g", x); 
+       snprintf (buf, sizeof (buf), "%.12g", x);
        root->add_property (X_("x"), buf);
        root->add_property (X_("type"), EqualPowerStereoPanner::name);
 
@@ -485,7 +542,7 @@ EqualPowerStereoPanner::state (bool full_state)
 }
 
 int
-EqualPowerStereoPanner::set_state (const XMLNode& node)
+EqualPowerStereoPanner::set_state (const XMLNode& node, int version)
 {
        const XMLProperty* prop;
        float pos;
@@ -494,20 +551,20 @@ EqualPowerStereoPanner::set_state (const XMLNode& node)
        if ((prop = node.property (X_("x")))) {
                pos = atof (prop->value().c_str());
                set_position (pos, true);
-       } 
+       }
 
-       StreamPanner::set_state (node);
+       StreamPanner::set_state (node, version);
 
        for (XMLNodeConstIterator iter = node.children().begin(); iter != node.children().end(); ++iter) {
 
                if ((*iter)->name() == X_("Controllable")) {
                        if ((prop = (*iter)->property("name")) != 0 && prop->value() == "panner") {
-                               _control->set_state (**iter);
+                               _control->set_state (**iter, version);
                        }
 
                } else if ((*iter)->name() == X_("Automation")) {
 
-                       _control->alist()->set_state (*((*iter)->children().front()));
+                       _control->alist()->set_state (*((*iter)->children().front()), version);
 
                        if (_control->alist()->automation_state() != Off) {
                                set_position (_control->list()->eval (parent.session().transport_frame()));
@@ -554,7 +611,7 @@ Multi2dPanner::update ()
        fr = (float) (1.0 / sqrt((double)f));
 #else
        fr = 1.0 / sqrtf(f);
-#endif 
+#endif
        for (i = 0; i < nouts; ++i) {
                parent.outputs[i].desired_pan = 1.0f - (dsq[i] * fr);
        }
@@ -563,7 +620,7 @@ Multi2dPanner::update ()
 }
 
 void
-Multi2dPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes)
+Multi2dPanner::do_distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes)
 {
        Sample* dst;
        pan_t pan;
@@ -573,43 +630,43 @@ Multi2dPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co
        if (_muted) {
                return;
        }
-       
+
        Sample* const src = srcbuf.data();
 
 
        for (n = 0, o = parent.outputs.begin(); o != parent.outputs.end(); ++o, ++n) {
 
                dst = obufs.get_audio(n).data();
-       
+
 #ifdef CAN_INTERP
-               if (fabsf ((delta = (left_interp - desired_left))) > 0.002) { // about 1 degree of arc 
-                       
+               if (fabsf ((delta = (left_interp - desired_left))) > 0.002) { // about 1 degree of arc
+
                        /* interpolate over 64 frames or nframes, whichever is smaller */
-                       
+
                        nframes_t limit = min ((nframes_t)64, nframes);
                        nframes_t n;
-                       
+
                        delta = -(delta / (float) (limit));
-               
+
                        for (n = 0; n < limit; n++) {
                                left_interp = left_interp + delta;
                                left = left_interp + 0.9 * (left - left_interp);
                                dst[n] += src[n] * left * gain_coeff;
                        }
-                       
+
                        pan = left * gain_coeff;
                        mix_buffers_with_gain(dst+n,src+n,nframes-n,pan);
-                       
+
                } else {
 
-#else                  
+#else
                        pan = (*o).desired_pan;
-                       
+
                        if ((pan *= gain_coeff) != 1.0f) {
-                               
+
                                if (pan != 0.0f) {
                                        mix_buffers_with_gain(dst,src,nframes,pan);
-                               } 
+                               }
                        } else {
                                        mix_buffers_no_gain(dst,src,nframes);
                        }
@@ -618,14 +675,14 @@ Multi2dPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co
                }
 #endif
        }
-       
+
        return;
 }
 
 void
-Multi2dPanner::distribute_automated (AudioBuffer& src, BufferSet& obufs, 
-                                    nframes_t start, nframes_t end, nframes_t nframes,
-                                    pan_t** buffers)
+Multi2dPanner::do_distribute_automated (AudioBuffer& /*src*/, BufferSet& /*obufs*/,
+                                       nframes_t /*start*/, nframes_t /*end*/, nframes_t /*nframes*/,
+                                       pan_t** /*buffers*/)
 {
        if (_muted) {
                return;
@@ -643,7 +700,7 @@ Multi2dPanner::factory (Panner& p, Evoral::Parameter param)
 }
 
 int
-Multi2dPanner::load (istream& in, string path, uint32_t& linecnt)
+Multi2dPanner::load (istream& /*in*/, string /*path*/, uint32_t& /*linecnt*/)
 {
        return 0;
 }
@@ -655,15 +712,15 @@ Multi2dPanner::get_state (void)
 }
 
 XMLNode&
-Multi2dPanner::state (bool full_state)
+Multi2dPanner::state (bool /*full_state*/)
 {
        XMLNode* root = new XMLNode ("StreamPanner");
        char buf[64];
        LocaleGuard lg (X_("POSIX"));
 
-       snprintf (buf, sizeof (buf), "%.12g", x); 
+       snprintf (buf, sizeof (buf), "%.12g", x);
        root->add_property (X_("x"), buf);
-       snprintf (buf, sizeof (buf), "%.12g", y); 
+       snprintf (buf, sizeof (buf), "%.12g", y);
        root->add_property (X_("y"), buf);
        root->add_property (X_("type"), Multi2dPanner::name);
 
@@ -673,7 +730,7 @@ Multi2dPanner::state (bool full_state)
 }
 
 int
-Multi2dPanner::set_state (const XMLNode& node)
+Multi2dPanner::set_state (const XMLNode& node, int version)
 {
        const XMLProperty* prop;
        float newx,newy;
@@ -685,17 +742,17 @@ Multi2dPanner::set_state (const XMLNode& node)
        if ((prop = node.property (X_("x")))) {
                newx = atof (prop->value().c_str());
        }
-       
+
        if ((prop = node.property (X_("y")))) {
                newy = atof (prop->value().c_str());
        }
-       
+
        if (x < 0 || y < 0) {
                error << _("badly-formed positional data for Multi2dPanner - ignored")
                      << endmsg;
                return -1;
-       } 
-       
+       }
+
        set_position (newx, newy);
        return 0;
 }
@@ -703,7 +760,8 @@ Multi2dPanner::set_state (const XMLNode& node)
 /*---------------------------------------------------------------------- */
 
 Panner::Panner (string name, Session& s)
-       : Processor(s, name, PostFader)
+       : SessionObject (s, name)
+       , AutomatableControls (s)
 {
        //set_name_old_auto (name);
        set_name (name);
@@ -748,6 +806,86 @@ Panner::set_bypassed (bool yn)
 }
 
 
+void
+Panner::reset_to_default ()
+{
+       vector<float> positions;
+
+       switch (outputs.size()) {
+       case 0:
+       case 1:
+               return;
+       }
+
+       if (outputs.size() == 2) {
+               switch (_streampanners.size()) {
+               case 1:
+                       _streampanners.front()->set_position (0.5);
+                       _streampanners.front()->pan_control()->list()->reset_default (0.5);
+                       return;
+                       break;
+               case 2:
+                       _streampanners.front()->set_position (0.0);
+                       _streampanners.front()->pan_control()->list()->reset_default (0.0);
+                       _streampanners.back()->set_position (1.0);
+                       _streampanners.back()->pan_control()->list()->reset_default (1.0);
+                       return;
+               default:
+                       break;
+               }
+       }
+
+       vector<Output>::iterator o;
+       vector<StreamPanner*>::iterator p;
+
+       for (o = outputs.begin(), p = _streampanners.begin(); o != outputs.end() && p != _streampanners.end(); ++o, ++p) {
+               (*p)->set_position ((*o).x, (*o).y);
+       }
+}
+
+void
+Panner::reset_streampanner (uint32_t which)
+{
+       if (which >= _streampanners.size() || which >= outputs.size()) {
+               return;
+       }
+
+       switch (outputs.size()) {
+       case 0:
+       case 1:
+               return;
+
+       case 2:
+               switch (_streampanners.size()) {
+               case 1:
+                       /* stereo out, 1 stream, default = middle */
+                       _streampanners.front()->set_position (0.5);
+                       _streampanners.front()->pan_control()->list()->reset_default (0.5);
+                       break;
+               case 2:
+                       /* stereo out, 2 streams, default = hard left/right */
+                       if (which == 0) {
+                               _streampanners.front()->set_position (0.0);
+                               _streampanners.front()->pan_control()->list()->reset_default (0.0);
+                       } else {
+                               _streampanners.back()->set_position (1.0);
+                               _streampanners.back()->pan_control()->list()->reset_default (1.0);
+                       }
+                       break;
+               }
+               return;
+
+       default:
+               _streampanners[which]->set_position (outputs[which].x, outputs[which].y);
+       }
+}
+
+/**
+ *    Reset the panner with a given number of outs and panners (and hence inputs)
+ *
+ *    \param nouts Number of outputs.
+ *    \param npans Number of panners.
+ */
 void
 Panner::reset (uint32_t nouts, uint32_t npans)
 {
@@ -755,14 +893,16 @@ Panner::reset (uint32_t nouts, uint32_t npans)
        bool changed = false;
        bool do_not_and_did_not_need_panning = ((nouts < 2) && (outputs.size() < 2));
 
-       /* if new and old config don't need panning, or if 
+       cout << "Reset panner for " << nouts << " " << npans << "\n";
+
+       /* if new and old config don't need panning, or if
           the config hasn't changed, we're done.
        */
 
-       if (do_not_and_did_not_need_panning || 
+       if (do_not_and_did_not_need_panning ||
            ((nouts == outputs.size()) && (npans == _streampanners.size()))) {
                return;
-       } 
+       }
 
        n = _streampanners.size();
        clear_panners ();
@@ -814,7 +954,7 @@ Panner::reset (uint32_t nouts, uint32_t npans)
                        _streampanners.push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, 0, n)));
                }
 
-               break; 
+               break;
 
        case 4: // square
                outputs.push_back (Output  (0, 0));
@@ -826,7 +966,7 @@ Panner::reset (uint32_t nouts, uint32_t npans)
                        _streampanners.push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, 0, n)));
                }
 
-               break;  
+               break;
 
        case 5: //square+offcenter center
                outputs.push_back (Output  (0, 0));
@@ -858,9 +998,9 @@ Panner::reset (uint32_t nouts, uint32_t npans)
                (*x)->update ();
        }
 
-       /* force hard left/right panning in a common case: 2in/2out 
+       /* force hard left/right panning in a common case: 2in/2out
        */
-       
+
        if (npans == 2 && outputs.size() == 2) {
 
                /* Do this only if we changed configuration, or our configuration
@@ -874,13 +1014,13 @@ Panner::reset (uint32_t nouts, uint32_t npans)
                _streampanners.back()->get_position (right);
 
                if (changed || ((left == 0.5) && (right == 0.5))) {
-               
+
                        _streampanners.front()->set_position (0.0);
                        _streampanners.front()->pan_control()->list()->reset_default (0.0);
-                       
+
                        _streampanners.back()->set_position (1.0);
                        _streampanners.back()->pan_control()->list()->reset_default (1.0);
-                       
+
                        changed = true;
                }
        }
@@ -897,7 +1037,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;
@@ -924,7 +1064,7 @@ Panner::set_automation_style (AutoStyle style)
                ((AutomationList*)(*i)->pan_control()->list().get())->set_automation_style (style);
        }
        _session.set_dirty ();
-}      
+}
 
 void
 Panner::set_automation_state (AutoState state)
@@ -933,28 +1073,35 @@ Panner::set_automation_state (AutoState state)
                ((AutomationList*)(*i)->pan_control()->list().get())->set_automation_state (state);
        }
        _session.set_dirty ();
-}      
+}
 
 AutoState
 Panner::automation_state () const
 {
+       boost::shared_ptr<AutomationList> l;
        if (!empty()) {
-               return ((AutomationList*)_streampanners.front()->pan_control()->list().get())->automation_state ();
-       } else {
-               return Off;
+               boost::shared_ptr<AutomationControl> control = _streampanners.front()->pan_control();
+               if (control) {
+                       l = boost::dynamic_pointer_cast<AutomationList>(control->list());
+               }
        }
+
+       return l ? l->automation_state() : Off;
 }
 
 AutoStyle
 Panner::automation_style () const
 {
+       boost::shared_ptr<AutomationList> l;
        if (!empty()) {
-               return ((AutomationList*)_streampanners.front()->pan_control()->list().get())->automation_style ();
-       } else {
-               return Absolute;
+               boost::shared_ptr<AutomationControl> control = _streampanners.front()->pan_control();
+               if (control) {
+                       l = boost::dynamic_pointer_cast<AutomationList>(control->list());
+               }
        }
-}
 
+       return l ? l->automation_style() : Absolute;
+}
 
 struct PanPlugins {
     string name;
@@ -977,15 +1124,13 @@ Panner::get_state (void)
 XMLNode&
 Panner::state (bool full)
 {
-       XMLNode& node = Processor::state(full);
-
-       node.add_property ("type", "panner");
+       XMLNode* node = new XMLNode ("Panner");
 
        char buf[32];
 
-       node.add_property (X_("linked"), (_linked ? "yes" : "no"));
-       node.add_property (X_("link_direction"), enum_2_string (_link_direction));
-       node.add_property (X_("bypassed"), (bypassed() ? "yes" : "no"));
+       node->add_property (X_("linked"), (_linked ? "yes" : "no"));
+       node->add_property (X_("link_direction"), enum_2_string (_link_direction));
+       node->add_property (X_("bypassed"), (bypassed() ? "yes" : "no"));
 
        for (vector<Panner::Output>::iterator o = outputs.begin(); o != outputs.end(); ++o) {
                XMLNode* onode = new XMLNode (X_("Output"));
@@ -993,19 +1138,19 @@ Panner::state (bool full)
                onode->add_property (X_("x"), buf);
                snprintf (buf, sizeof (buf), "%.12g", (*o).y);
                onode->add_property (X_("y"), buf);
-               node.add_child_nocopy (*onode);
+               node->add_child_nocopy (*onode);
        }
 
        for (vector<StreamPanner*>::const_iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
-               node.add_child_nocopy ((*i)->state (full));
+               node->add_child_nocopy ((*i)->state (full));
        }
 
 
-       return node;
+       return *node;
 }
 
 int
-Panner::set_state (const XMLNode& node)
+Panner::set_state (const XMLNode& node, int version)
 {
        XMLNodeList nlist;
        XMLNodeConstIterator niter;
@@ -1017,8 +1162,6 @@ Panner::set_state (const XMLNode& node)
 
        clear_panners ();
 
-       Processor::set_state(node);
-
        ChanCount ins = ChanCount::ZERO;
        ChanCount outs = ChanCount::ZERO;
 
@@ -1026,14 +1169,14 @@ Panner::set_state (const XMLNode& node)
        outputs.clear ();
 
        if ((prop = node.property (X_("linked"))) != 0) {
-               set_linked (prop->value() == "yes");
+               set_linked (string_is_affirmative (prop->value()));
        }
 
 
        if ((prop = node.property (X_("bypassed"))) != 0) {
-               set_bypassed (prop->value() == "yes");
+               set_bypassed (string_is_affirmative (prop->value()));
        }
-    
+
        if ((prop = node.property (X_("link_direction"))) != 0) {
                LinkDirection ld; /* here to provide type information */
                set_link_direction (LinkDirection (string_2_enum (prop->value(), ld)));
@@ -1043,15 +1186,15 @@ Panner::set_state (const XMLNode& node)
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                if ((*niter)->name() == X_("Output")) {
-                       
+
                        float x, y;
-                       
+
                        prop = (*niter)->property (X_("x"));
                        sscanf (prop->value().c_str(), "%g", &x);
-                       
+
                        prop = (*niter)->property (X_("y"));
                        sscanf (prop->value().c_str(), "%g", &y);
-                       
+
                        outputs.push_back (Output (x, y));
                }
        }
@@ -1059,30 +1202,30 @@ Panner::set_state (const XMLNode& node)
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 
                if ((*niter)->name() == X_("StreamPanner")) {
-               
+
                        if ((prop = (*niter)->property (X_("type")))) {
-                               
+
                                for (i = 0; pan_plugins[i].factory; ++i) {
                                        if (prop->value() == pan_plugins[i].name) {
-                                               
-                                               
+
+
                                                /* note that we assume that all the stream panners
                                                   are of the same type. pretty good
                                                   assumption, but it's still an assumption.
                                                */
-                                               
+
                                                sp = pan_plugins[i].factory (*this, Evoral::Parameter(PanAutomation, 0, num_panners));
                                                num_panners++;
-                                               
-                                               if (sp->set_state (**niter) == 0) {
+
+                                               if (sp->set_state (**niter, version) == 0) {
                                                        _streampanners.push_back (sp);
                                                }
-                                               
+
                                                break;
                                        }
                                }
-                               
-                               
+
+
                                if (!pan_plugins[i].factory) {
                                        error << string_compose (_("Unknown panner plugin \"%1\" found in pan state - ignored"),
                                                          prop->value())
@@ -1095,7 +1238,7 @@ Panner::set_state (const XMLNode& node)
                                return -1;
                        }
 
-               }       
+               }
        }
 
        reset (outputs.size (), num_panners);
@@ -1104,9 +1247,9 @@ Panner::set_state (const XMLNode& node)
        if ((prop = node.property (X_("automation")))) {
 
                /* automation path is relative */
-               
+
                automation_path = Glib::build_filename(_session.automation_dir(), prop->value ());
-       } 
+       }
 
        return 0;
 }
@@ -1132,7 +1275,7 @@ Panner::set_position (float xpos, StreamPanner& orig)
 
        orig.get_position (xnow);
        xdelta = xpos - xnow;
-       
+
        if (_link_direction == SameDirection) {
 
                for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
@@ -1171,7 +1314,7 @@ Panner::set_position (float xpos, float ypos, StreamPanner& orig)
        orig.get_position (xnow, ynow);
        xdelta = xpos - xnow;
        ydelta = ypos - ynow;
-       
+
        if (_link_direction == SameDirection) {
 
                for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
@@ -1197,7 +1340,7 @@ Panner::set_position (float xpos, float ypos, StreamPanner& orig)
                                (*i)->set_position (xpos, ypos, true);
                        } else {
                                (*i)->get_position (xnow, ynow);
-                               
+
                                xnew = min (1.0f, xnow - xdelta);
                                xnew = max (0.0f, xnew);
 
@@ -1229,7 +1372,7 @@ Panner::set_position (float xpos, float ypos, float zpos, StreamPanner& orig)
                                (*i)->set_position (xpos, ypos, zpos, true);
                        } else {
                                (*i)->get_position (xnow, ynow, znow);
-                               
+
                                xnew = min (1.0f, xnow + xdelta);
                                xnew = max (0.0f, xnew);
 
@@ -1267,7 +1410,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...
@@ -1279,7 +1422,7 @@ Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes
        assert(!bypassed());
        assert(!empty());
 
-       
+
        if (outbufs.count().n_audio() == 1) {
 
                AudioBuffer& dst = outbufs.get_audio(0);
@@ -1288,46 +1431,46 @@ 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.merge_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);
+                               }
+                       }
 
                }
 
                return;
        }
-       
+
        /* 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,8 +1481,8 @@ 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 (BufferSet& inbufs, BufferSet& outbufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
+{
        if (outbufs.count().n_audio() == 0) {
                // Failing to deliver audio we were asked to deliver is a bug
                assert(inbufs.count().n_audio() == 0);
@@ -1351,21 +1494,21 @@ Panner::run_out_of_place (BufferSet& inbufs, BufferSet& outbufs, nframes_t start
        assert(!empty());
 
        // If we shouldn't play automation defer to distribute_no_automation
-       if ( !( automation_state() & Play ||
-                        ((automation_state() & Touch) && !touching()) ) ) {
+       if (!(automation_state() & Play || ((automation_state() & Touch) && !touching()))) {
 
                // Speed quietning
                gain_t gain_coeff = 1.0;
+
                if (fabsf(_session.transport_speed()) > 1.5f) {
                        gain_coeff = speed_quietning;
                }
 
-               distribute_no_automation(inbufs, outbufs, nframes, offset, gain_coeff);
+               distribute_no_automation (inbufs, outbufs, nframes, gain_coeff);
                return;
        }
 
        // Otherwise.. let the automation flow, baby
-       
+
        if (outbufs.count().n_audio() == 1) {
 
                AudioBuffer& dst = outbufs.get_audio(0);
@@ -1373,12 +1516,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.merge_from(*i, nframes);
                }
 
                return;
@@ -1386,10 +1529,10 @@ Panner::run_out_of_place (BufferSet& inbufs, BufferSet& outbufs, nframes_t start
 
        // More than 1 output, we should have 1 panner for each input
        //assert(_streampanners.size() == inbufs.count().n_audio());
-       
+
        /* 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();
@@ -1404,7 +1547,7 @@ Panner::run_out_of_place (BufferSet& inbufs, BufferSet& outbufs, nframes_t start
 void
 Panner::set_name (string str)
 {
-       automation_path = Glib::build_filename(_session.automation_dir(), 
+       automation_path = Glib::build_filename(_session.automation_dir(),
                _session.snap_name() + "-pan-" + legalize_for_path (str) + ".automation");
 }
 */
@@ -1421,7 +1564,7 @@ Panner::load ()
        if (automation_path.length() == 0) {
                return 0;
        }
-       
+
        if (access (automation_path.c_str(), F_OK)) {
                return 0;
        }
@@ -1446,7 +1589,7 @@ Panner::load ()
                                        return -1;
                                }
                        } else {
-                               error << string_compose(_("no version information in pan automation event file \"%1\" (first line = %2)"), 
+                               error << string_compose(_("no version information in pan automation event file \"%1\" (first line = %2)"),
                                                 automation_path, line) << endmsg;
                                return -1;
                        }
@@ -1459,7 +1602,7 @@ Panner::load ()
                }
 
                if (strcmp (line, "begin") == 0) {
-                       
+
                        if (sp == _streampanners.end()) {
                                error << string_compose (_("too many panner states found in pan automation file %1"),
                                                  automation_path)
@@ -1470,10 +1613,23 @@ Panner::load ()
                        if ((*sp)->load (in, automation_path, linecnt)) {
                                return -1;
                        }
-                       
+
                        ++sp;
                }
        }
 
        return 0;
 }
+
+void
+Panner::set_mono (bool yn)
+{
+       if (yn != _mono) {
+               _mono = yn;
+               StateChanged ();
+       }
+
+       for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
+               (*i)->set_mono (yn);
+       }
+}