change Session::convert_to_frames_at() to Session::convert_to_frames() to reflect...

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

diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index c3f4d52a5678d73a3c0b738921d6afed2a1b99f7..cb2ad8dd4a127aa04ed76869f311380eaa9d52c4 100644 (file)
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -75,7 +75,7 @@ static double direct_control_to_stereo_pan (double fract)
 
 StreamPanner::StreamPanner (Panner& p, Evoral::Parameter param)
        : parent (p)
-        , _control (new PanControllable (parent.session(), _("direction"), *this, param))
+        , _control (new PanControllable (parent.session(), _("direction"), this, param))
 {
        assert (param.type() != NullAutomation);
 
@@ -112,7 +112,7 @@ StreamPanner::PanControllable::lower () const
 void
 StreamPanner::PanControllable::set_value (double val)
 {
-        Panner& p (streampanner.get_parent());
+        Panner& p (streampanner->get_parent());
         switch (parameter().id()) {
         case 100:
                 /* position */
@@ -131,7 +131,7 @@ StreamPanner::PanControllable::set_value (double val)
                 break;
 
         default:
-                streampanner.set_position (AngularVector (direct_control_to_stereo_pan (val), 0.0));
+                streampanner->set_position (AngularVector (direct_control_to_stereo_pan (val), 0.0));
                 AutomationControl::set_value(val);
                 break;
         }
@@ -1454,11 +1454,14 @@ Panner::set_stereo_pan (double direction_as_lr_fract, double width)
                 swap (l_index, r_index);
         }
 
-        /* if the new right position is less than or equal to 180 (hard left) and the left panner
+        l_pos = max (min (l_pos, 180.0), 0.0);
+        r_pos = max (min (r_pos, 180.0), 0.0);
+
+        /* if the new left position is less than or equal to 180 (hard left) and the left panner
            is already there, we're not moving the left signal. 
         */
 
-        if (l_pos > 180.0 && _streampanners[l_index]->get_position().azi == 180.0) {
+        if (l_pos >= 180.0 &&_streampanners[l_index]->get_position().azi == 180.0) {
                 move_left = false;
         }
 
@@ -1470,14 +1473,9 @@ Panner::set_stereo_pan (double direction_as_lr_fract, double width)
                 move_right = false;
         }
 
-        l_pos = max (min (l_pos, 180.0), 0.0);
-        r_pos = max (min (r_pos, 180.0), 0.0);
-
         if (move_left && move_right) {
                 _streampanners[l_index]->set_position (AngularVector (l_pos, 0.0));
                 _streampanners[r_index]->set_position (AngularVector (r_pos, 0.0));
-
-                // cerr << "left @ " << BaseStereoPanner::azimuth_to_lr_fract (l_pos) << " right @ " << BaseStereoPanner::azimuth_to_lr_fract (r_pos) << endl;
         }
 
         return move_left && move_right;
@@ -1498,22 +1496,31 @@ Panner::setup_meta_controls ()
         
         Evoral::Parameter lr_param (PanAutomation, 0, 100);
         Evoral::Parameter width_param (PanAutomation, 0, 200);
-        boost::shared_ptr<AutomationControl> wc;
-        boost::shared_ptr<AutomationControl> dc;
+        boost::shared_ptr<AutomationControl> dc = automation_control (lr_param);
+        boost::shared_ptr<AutomationControl> wc = automation_control (width_param);
 
-        if (!automation_control (lr_param)) {
-                dc.reset (new StreamPanner::PanControllable (_session, _("lr"), *_streampanners.front(), lr_param));
+        if (dc) {
+               /* reset parent StreamPanner as the current one may have been deleted */
+               boost::shared_ptr<StreamPanner::PanControllable> p = boost::dynamic_pointer_cast<StreamPanner::PanControllable> (dc);
+               assert (p);
+               p->streampanner = _streampanners.front ();
+       } else {
+                dc.reset (new StreamPanner::PanControllable (_session, _("lr"), _streampanners.front(), lr_param));
                 add_control (dc);
         }
         
-        if (!automation_control (width_param)) {
-                wc.reset (new StreamPanner::PanControllable (_session, _("width"), *_streampanners.front(), width_param));
+        if (wc) {
+               /* reset parent as above */
+               boost::shared_ptr<StreamPanner::PanControllable> p = boost::dynamic_pointer_cast<StreamPanner::PanControllable> (wc);
+               assert (p);
+               p->streampanner = _streampanners.front ();
+       } else {
+                wc.reset (new StreamPanner::PanControllable (_session, _("width"), _streampanners.front(), width_param));
                 add_control (wc);
         }
 
         dc->set_value (0.5);
         wc->set_value (1.0); // full width
-
 }
 
 string