Add options to add sends from buses as well as tracks; remainder of #3637.
[ardour.git] / gtk2_ardour / stereo_panner.cc
index 1e12213168fd38619ad37f71b120bcbe22be6b60..2bb53e9c2344b6745fdbdede4d05f26b9c392f01 100644 (file)
@@ -90,13 +90,18 @@ void
 StereoPanner::set_tooltip ()
 {
         double pos = position_control->get_value(); // 0..1
-        double w = width_control->get_value (); // -1..+1
-        int lpos = (int) lrint ((pos - (w/2.0)) * 100.0);
-        int rpos = (int) lrint ((pos + (w/2.0)) * 100.0);
-                                
-        Gtkmm2ext::UI::instance()->set_tip (this, string_compose (_("L:%1 R:%2 Width: %3%%"), 
-                                                                  lpos, rpos,
-                                                                  (int) floor (w * 100.0)).c_str());
+        
+        /* the values displayed show the position of the center of the image, expressed as a stereo pair
+           that ranges from (100,0) (hard left) through (50,50) (hard center) to (0,100) (hard right).
+           the center of the image is halfway between the left and right positions.
+        */
+
+        Gtkmm2ext::UI::instance()->set_tip (this, 
+                                            string_compose (_("L:%1 R:%2 Width: %3%%\n\n0 -> set width to zero\n%4-uparrow -> set width to 1.0\n%4-downarrow -> set width to -1.0"), 
+                                                            (int) rint (100.0 * (1.0 - pos)),
+                                                            (int) rint (100.0 * pos),
+                                                            (int) floor (100.0 * width_control->get_value()),
+                                                            Keyboard::secondary_modifier_name()).c_str());
 }
 
 void
@@ -146,20 +151,18 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
         /* compute the centers of the L/R boxes based on the current stereo width */
         
         int usable_width = width - lr_box_size;
-        int center = lr_box_size/2 + (int) floor (usable_width * pos);
-        int left = center - (int) floor (fswidth * usable_width / 2.0); // center of leftmost box
-        int right = center + (int) floor (fswidth * usable_width / 2.0); // center of rightmost box
-
-        // cerr << "pos " << pos << " width = " << width << " swidth = " << swidth << " center @ " << center << " L = " << left << " R = " << right << endl;
+        double center = (lr_box_size/2.0) + (usable_width * pos);
+        int left = lrint (center - (fswidth * usable_width / 2.0)); // center of leftmost box
+        int right = lrint (center +  (fswidth * usable_width / 2.0)); // center of rightmost box
 
         /* compute & draw the line through the box */
         
         cairo_set_line_width (cr, 2);
         cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
-        cairo_move_to (cr, left, top_step+(pos_box_size/2)+step_down);
-        cairo_line_to (cr, left, top_step+(pos_box_size/2));
-        cairo_line_to (cr, right, top_step+(pos_box_size/2));
-        cairo_line_to (cr, right, top_step+(pos_box_size/2) + step_down);
+        cairo_move_to (cr, left-(lr_box_size/2), top_step+(pos_box_size/2)+step_down);
+        cairo_line_to (cr, left-(lr_box_size/2), top_step+(pos_box_size/2));
+        cairo_line_to (cr, right+(lr_box_size/2)+1, top_step+(pos_box_size/2));
+        cairo_line_to (cr, right+(lr_box_size/2)+1, top_step+(pos_box_size/2) + step_down);
         cairo_stroke (cr);
 
         if (swidth < 0.0) {
@@ -167,11 +170,12 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
                 swap (left, right);
         }
 
-        /* left box */
-
+        /* make left/right be the left edge of each box */
         left -= lr_box_size/2;
         right -= lr_box_size/2;
 
+        /* left box */
+
         cairo_rectangle (cr, 
                          left,
                          (lr_box_size/2)+step_down, 
@@ -189,7 +193,7 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
         cairo_select_font_face (cr, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
         if (state != Mono) {
                 cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
-                cairo_show_text (cr, "L");
+                cairo_show_text (cr, _("L"));
         }
 
         /* right box */
@@ -210,15 +214,15 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
                        (lr_box_size/2)+step_down + 13);
         cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
         if (state == Mono) {
-                cairo_show_text (cr, "M");
+                cairo_show_text (cr, _("M"));
         } else {
-                cairo_show_text (cr, "R");
+                cairo_show_text (cr, _("R"));
         }
 
         /* draw the central box */
 
         cairo_set_line_width (cr, 1);
-       cairo_rectangle (cr, center - (pos_box_size/2), top_step, pos_box_size, pos_box_size);
+       cairo_rectangle (cr, lrint (center - (pos_box_size/2.0)), top_step, pos_box_size, pos_box_size);
         cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
         cairo_stroke_preserve (cr);
         cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
@@ -245,10 +249,8 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
 
         if (ev->type == GDK_2BUTTON_PRESS) {
                 if (dragging_position) {
-                        cerr << "Reset pos\n";
                         position_control->set_value (0.5); // reset position to center
                 } else {
-                        cerr << "Reset width\n";
                         width_control->set_value (1.0); // reset position to full, LR
                 }
                 dragging = false;
@@ -337,16 +339,20 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev)
                                 /* still left */
                                 if (ev->x > last_drag_x) {
                                         /* motion to left */
+                                        cerr << "was left, still left, move left\n";
                                         drag_dir = -inc;
                                 } else {
+                                        cerr << "was left, still left, move right\n";
                                         drag_dir = inc;
                                 }
                         } else {
                                 /* now right */
                                 if (ev->x > last_drag_x) {
                                         /* motion to left */
+                                        cerr << "was left, gone right, move left\n";
                                         drag_dir = inc;
                                 } else {
+                                        cerr << "was left, gone right, move right\n";
                                         drag_dir = -inc;
                                 }
                         }
@@ -359,16 +365,20 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev)
                                 /* still right */
                                 if (ev->x < last_drag_x) {
                                         /* motion to right */
+                                        cerr << "was right, still right, move right\n";
                                         drag_dir = -inc;
                                 } else {
+                                        cerr << "was right, still right, move left\n";
                                         drag_dir = inc;
                                 }
                         } else {
                                 /* now left */
                                 if (ev->x < last_drag_x) {
                                         /* motion to right */
+                                        cerr << "was right, gone left, move right\n";
                                         drag_dir = inc;
                                 } else {
+                                        cerr << "was right, gone left, move left\n";
                                         drag_dir = -inc;
                                 }
                         }
@@ -378,6 +388,7 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev)
                 old_wv = wv;
                 wv = wv + (drag_dir * delta);
                 
+                cerr << this << " set width to " << wv << endl;
                 width_control->set_value (wv);
 
         } else {
@@ -390,6 +401,7 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev)
                         pv = pv - delta;
                 }
 
+                cerr << this << " set position to " << pv << endl;
                 position_control->set_value (pv);
         }