X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmono_panner.cc;h=791c3e8d0b52b733c9f4b210479d80ac94f2c554;hb=e549e8f82c151db4ba6cd95ed5045c530453900f;hp=8b3cbc73b2e4aaf2b24dd360f92ca120d1761159;hpb=f0052b463dc757223fa8dee3c2cd41b6a4ea6f41;p=ardour.git diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index 8b3cbc73b2..791c3e8d0b 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -34,6 +34,7 @@ #include "ardour/panner.h" #include "ardour/panner.h" +#include "ardour/pannable.h" #include "ardour_ui.h" #include "global_signals.h" @@ -55,8 +56,9 @@ static const int top_step = 2; MonoPanner::ColorScheme MonoPanner::colors; bool MonoPanner::have_colors = false; -MonoPanner::MonoPanner (boost::shared_ptr position) - : position_control (position) +MonoPanner::MonoPanner (boost::shared_ptr panner) + : _panner (panner) + , position_control (_panner->pannable()->pan_azimuth_control) , dragging (false) , drag_start_x (0) , last_drag_x (0) @@ -64,7 +66,7 @@ MonoPanner::MonoPanner (boost::shared_ptr position) , detented (false) , drag_data_window (0) , drag_data_label (0) - , position_binder (position) + , position_binder (position_control) { if (!have_colors) { set_colors (); @@ -97,9 +99,9 @@ MonoPanner::set_drag_data () } double pos = position_control->get_value(); // 0..1 - + /* 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 @@ -121,12 +123,12 @@ MonoPanner::value_change () } bool -MonoPanner::on_expose_event (GdkEventExpose* ev) +MonoPanner::on_expose_event (GdkEventExpose*) { Glib::RefPtr win (get_window()); Glib::RefPtr gc (get_style()->get_base_gc (get_state())); Cairo::RefPtr context = get_window()->create_cairo_context(); - + int width, height; double pos = position_control->get_value (); /* 0..1 */ uint32_t o, f, t, b, pf, po; @@ -154,7 +156,7 @@ MonoPanner::on_expose_event (GdkEventExpose* ev) if (fmod (usable_width,2.0) == 0) { /* even width, but we need odd, so that there is an exact center. - So, offset cairo by 1, and reduce effective width by 1 + So, offset cairo by 1, and reduce effective width by 1 */ usable_width -= 1.0; context->translate (1.0, 0.0); @@ -173,18 +175,18 @@ MonoPanner::on_expose_event (GdkEventExpose* ev) context->move_to ((pos_box_size/2.0) + (usable_width/2.0), 0); context->line_to ((pos_box_size/2.0) + (usable_width/2.0), height); context->stroke (); - + /* left box */ - rounded_rectangle (context, + rounded_rectangle (context, left - half_lr_box, - half_lr_box+step_down, + half_lr_box+step_down, lr_box_size, lr_box_size, corner_radius); context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); context->stroke_preserve (); context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f)); context->fill (); - + /* add text */ context->move_to ( @@ -198,7 +200,7 @@ MonoPanner::on_expose_event (GdkEventExpose* ev) rounded_rectangle (context, right - half_lr_box, - half_lr_box+step_down, + half_lr_box+step_down, lr_box_size, lr_box_size, corner_radius); context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); context->stroke_preserve (); @@ -216,13 +218,17 @@ MonoPanner::on_expose_event (GdkEventExpose* ev) /* 2 lines that connect them both */ context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); context->set_line_width (1.0); - context->move_to (left + half_lr_box, half_lr_box+step_down); - context->line_to (right - half_lr_box, half_lr_box+step_down); + + /* make the lines a little longer than they need to be, because the corners of + the boxes are rounded and we don't want a gap + */ + context->move_to (left + half_lr_box - corner_radius, half_lr_box+step_down); + context->line_to (right - half_lr_box + corner_radius, half_lr_box+step_down); context->stroke (); - context->move_to (left + half_lr_box, half_lr_box+step_down+lr_box_size); - context->line_to (right - half_lr_box, half_lr_box+step_down+lr_box_size); + context->move_to (left + half_lr_box - corner_radius, half_lr_box+step_down+lr_box_size); + context->line_to (right - half_lr_box + corner_radius, half_lr_box+step_down+lr_box_size); context->stroke (); /* draw the position indicator */ @@ -261,7 +267,7 @@ MonoPanner::on_button_press_event (GdkEventButton* ev) { drag_start_x = ev->x; last_drag_x = ev->x; - + dragging = false; accumulated_delta = 0; detented = false; @@ -274,7 +280,7 @@ MonoPanner::on_button_press_event (GdkEventButton* ev) return true; } } - + if (ev->button != 1) { return false; } @@ -287,7 +293,7 @@ MonoPanner::on_button_press_event (GdkEventButton* ev) return true; } - + if (ev->x <= width/3) { /* left side dbl click */ position_control->set_value (0); @@ -304,7 +310,7 @@ MonoPanner::on_button_press_event (GdkEventButton* ev) if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) { /* handled by button release */ return true; - } + } dragging = true; StartGesture (); @@ -323,14 +329,13 @@ MonoPanner::on_button_release_event (GdkEventButton* ev) dragging = false; accumulated_delta = 0; detented = false; - + if (drag_data_window) { drag_data_window->hide (); } - + if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) { - /* reset to default */ - position_control->set_value (0.5); + _panner->reset (); } else { StopGesture (); } @@ -344,7 +349,7 @@ MonoPanner::on_scroll_event (GdkEventScroll* ev) double one_degree = 1.0/180.0; // one degree as a number from 0..1, since 180 degrees is the full L/R axis double pv = position_control->get_value(); // 0..1.0 ; 0 = left double step; - + if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { step = one_degree; } else { @@ -379,14 +384,14 @@ MonoPanner::on_motion_notify_event (GdkEventMotion* ev) drag_data_window->set_name (X_("ContrastingPopup")); drag_data_window->set_position (WIN_POS_MOUSE); drag_data_window->set_decorated (false); - + drag_data_label = manage (new Label); drag_data_label->set_use_markup (true); drag_data_window->set_border_width (6); drag_data_window->add (*drag_data_label); drag_data_label->show (); - + Window* toplevel = dynamic_cast (get_toplevel()); if (toplevel) { drag_data_window->set_transient_for (*toplevel); @@ -403,20 +408,20 @@ MonoPanner::on_motion_notify_event (GdkEventMotion* ev) int w = get_width(); double delta = (ev->x - last_drag_x) / (double) w; - + /* create a detent close to the center */ - + if (!detented && ARDOUR::Panner::equivalent (position_control->get_value(), 0.5)) { detented = true; /* snap to center */ position_control->set_value (0.5); } - + if (detented) { accumulated_delta += delta; - + /* have we pulled far enough to escape ? */ - + if (fabs (accumulated_delta) >= 0.025) { position_control->set_value (position_control->get_value() + accumulated_delta); detented = false; @@ -457,21 +462,21 @@ MonoPanner::on_key_press_event (GdkEventKey* ev) pv += step; position_control->set_value (pv); break; - default: + default: return false; } - + return true; } bool -MonoPanner::on_key_release_event (GdkEventKey* ev) +MonoPanner::on_key_release_event (GdkEventKey*) { return false; } bool -MonoPanner::on_enter_notify_event (GdkEventCrossing* ev) +MonoPanner::on_enter_notify_event (GdkEventCrossing*) { grab_focus (); Keyboard::magic_widget_grab_focus ();