X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpanners%2F2in2out%2Fpanner_2in2out.cc;h=9105eff7134800b8294817bac5026b6f58abfcb3;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=6740f56e6578eb4cf2c8b61b1bd0be5a8dc37d1b;hpb=08371ae2cf6231bbb8522645d14add41ffa9c1c0;p=ardour.git diff --git a/libs/panners/2in2out/panner_2in2out.cc b/libs/panners/2in2out/panner_2in2out.cc index 6740f56e65..9105eff713 100644 --- a/libs/panners/2in2out/panner_2in2out.cc +++ b/libs/panners/2in2out/panner_2in2out.cc @@ -21,14 +21,12 @@ #include #include -#include #include #include #include #include #include #include -#include #include @@ -49,12 +47,11 @@ #include "ardour/runtime_functions.h" #include "ardour/session.h" #include "ardour/utils.h" -#include "ardour/visibility.h" #include "ardour/mix.h" #include "panner_2in2out.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "pbd/mathfix.h" @@ -64,7 +61,10 @@ using namespace PBD; static PanPluginDescriptor _descriptor = { "Equal Power Stereo", + "http://ardour.org/plugin/panner_2in2out", + "http://ardour.org/plugin/panner_2in2out#ui", 2, 2, + 10000, Panner2in2out::factory }; @@ -74,20 +74,27 @@ Panner2in2out::Panner2in2out (boost::shared_ptr p) : Panner (p) { if (!_pannable->has_state()) { - _pannable->pan_azimuth_control->set_value (0.5); - _pannable->pan_width_control->set_value (1.0); - } - + _pannable->pan_azimuth_control->set_value (0.5, Controllable::NoGroup); + _pannable->pan_width_control->set_value (1.0, Controllable::NoGroup); + } + + double const w = width(); + double const wrange = min (position(), (1 - position())) * 2; + if (fabs(w) > wrange) { + set_width(w > 0 ? wrange : -wrange); + } + + update (); - + /* LEFT SIGNAL */ left_interp[0] = left[0] = desired_left[0]; - right_interp[0] = right[0] = desired_right[0]; - + right_interp[0] = right[0] = desired_right[0]; + /* RIGHT SIGNAL */ left_interp[1] = left[1] = desired_left[1]; right_interp[1] = right[1] = desired_right[1]; - + _pannable->pan_azimuth_control->Changed.connect_same_thread (*this, boost::bind (&Panner2in2out::update, this)); _pannable->pan_width_control->Changed.connect_same_thread (*this, boost::bind (&Panner2in2out::update, this)); } @@ -96,13 +103,13 @@ Panner2in2out::~Panner2in2out () { } -double +double Panner2in2out::position () const { return _pannable->pan_azimuth_control->get_value(); } -double +double Panner2in2out::width () const { return _pannable->pan_width_control->get_value(); @@ -112,7 +119,7 @@ void Panner2in2out::set_position (double p) { if (clamp_position (p)) { - _pannable->pan_azimuth_control->set_value (p); + _pannable->pan_azimuth_control->set_value (p, Controllable::NoGroup); } } @@ -120,7 +127,7 @@ void Panner2in2out::set_width (double p) { if (clamp_width (p)) { - _pannable->pan_width_control->set_value (p); + _pannable->pan_width_control->set_value (p, Controllable::NoGroup); } } @@ -142,20 +149,25 @@ Panner2in2out::update () /* it would be very nice to split this out into a virtual function 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. */ - + /* x == 0 => hard left = 180.0 degrees x == 1 => hard right = 0.0 degrees */ - + float pos[2]; double width = this->width (); const double direction_as_lr_fract = position (); + double const wrange = min (position(), (1 - position())) * 2; + if (fabs(width) > wrange) { + width = (width > 0 ? wrange : -wrange); + } + if (width < 0.0) { width = -width; pos[0] = direction_as_lr_fract + (width/2.0); // left signal lr_fract @@ -164,23 +176,23 @@ Panner2in2out::update () pos[1] = direction_as_lr_fract + (width/2.0); // right signal lr_fract pos[0] = direction_as_lr_fract - (width/2.0); // left signal lr_fract } - + /* compute target gain coefficients for both input signals */ - + float const pan_law_attenuation = -3.0f; float const scale = 2.0f - 4.0f * powf (10.0f,pan_law_attenuation/20.0f); float panR; float panL; - + /* left signal */ - + panR = pos[0]; panL = 1 - panR; desired_left[0] = panL * (scale * panL + 1.0f - scale); desired_right[0] = panR * (scale * panR + 1.0f - scale); - + /* right signal */ - + panR = pos[1]; panL = 1 - panR; desired_left[1] = panL * (scale * panL + 1.0f - scale); @@ -231,20 +243,20 @@ Panner2in2out::clamp_stereo_pan (double& direction_as_lr_fract, double& width) } /* if the new left position is less than or equal to zero (hard left) and the left panner - is already there, we're not moving the left signal. + is already there, we're not moving the left signal. */ - + if (l_pos < 0.0) { return false; } /* if the new right position is less than or equal to 1.0 (hard right) and the right panner - is already there, we're not moving the right signal. + is already there, we're not moving the right signal. */ - + if (r_pos > 1.0) { return false; - + } return true; @@ -260,7 +272,7 @@ Panner2in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai pan_t pan; Sample* const src = srcbuf.data(); - + /* LEFT OUTPUT */ dst = obufs.get_audio(0).data(); @@ -297,7 +309,7 @@ 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); @@ -312,7 +324,7 @@ Panner2in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai /* 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 that we wrote into the buffer */ } } @@ -355,17 +367,17 @@ Panner2in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai 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); // obufs.get_audio(1).read_from (srcbuf, nframes); - + /* 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 */ @@ -411,7 +423,7 @@ Panner2in2out::distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs, float panR; - if (which == 0) { + if (which == 0) { // panning left signal panR = position[n] - (width[n]/2.0f); // center - width/2 } else { @@ -419,15 +431,17 @@ Panner2in2out::distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs, panR = position[n] + (width[n]/2.0f); // center - width/2 } + panR = max(0.f, min(1.f, panR)); + const float panL = 1 - panR; /* note that are overwriting buffers, but its OK because we're finished with their old contents (position/width automation data) and are - replacing it with panning/gain coefficients + replacing it with panning/gain coefficients that we need to actually process the data. */ - + buffers[0][n] = panL * (scale * panL + 1.0f - scale); buffers[1][n] = panR * (scale * panR + 1.0f - scale); } @@ -465,11 +479,13 @@ XMLNode& Panner2in2out::get_state () { XMLNode& root (Panner::get_state ()); + root.add_property (X_("uri"), _descriptor.panner_uri); + /* this is needed to allow new sessions to load with old Ardour: */ root.add_property (X_("type"), _descriptor.name); return root; } -std::set +std::set Panner2in2out::what_can_be_automated() const { set s; @@ -491,8 +507,8 @@ Panner2in2out::describe_parameter (Evoral::Parameter p) } } -string -Panner2in2out::value_as_string (boost::shared_ptr ac) const +string +Panner2in2out::value_as_string (boost::shared_ptr ac) const { /* DO NOT USE LocaleGuard HERE */ double val = ac->get_value(); @@ -500,25 +516,25 @@ Panner2in2out::value_as_string (boost::shared_ptr ac) const switch (ac->parameter().type()) { case PanAzimuthAutomation: /* We show the position of the center of the image relative to the left & right. - This is expressed as a pair of percentage values that ranges from (100,0) + This is expressed as a pair of percentage values that ranges from (100,0) (hard left) through (50,50) (hard center) to (0,100) (hard right). - + This is pretty wierd, but its the way audio engineers expect it. Just remember that the center of the USA isn't Kansas, its (50LA, 50NY) and it will all make sense. - + This is designed to be as narrow as possible. Dedicated panner GUIs can do their own version of this if they need something less compact. */ - + return string_compose (_("L%1R%2"), (int) rint (100.0 * (1.0 - val)), (int) rint (100.0 * val)); case PanWidthAutomation: return string_compose (_("Width: %1%%"), (int) floor (100.0 * val)); - + default: - return _pannable->value_as_string (ac); + return _("unused"); } }