NOOP - re-indent src (no more mixed tab+space style)

This commit is contained in:
Robin Gareus 2014-01-09 19:22:18 +01:00
parent e5cad21a81
commit dbc54d9688

View file

@ -109,21 +109,21 @@ MonoPanner::set_tooltip ()
_tooltip.set_tip (_("bypassed")); _tooltip.set_tip (_("bypassed"));
return; return;
} }
double pos = position_control->get_value(); // 0..1 double pos = position_control->get_value(); // 0..1
/* We show the position of the center of the image relative to the left & right. /* 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). (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 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. the center of the USA isn't Kansas, its (50LA, 50NY) and it will all make sense.
*/ */
char buf[64]; char buf[64];
snprintf (buf, sizeof (buf), _("L:%3d R:%3d"), snprintf (buf, sizeof (buf), _("L:%3d R:%3d"),
(int) rint (100.0 * (1.0 - pos)), (int) rint (100.0 * (1.0 - pos)),
(int) rint (100.0 * pos)); (int) rint (100.0 * pos));
_tooltip.set_tip (buf); _tooltip.set_tip (buf);
} }
bool bool
@ -131,24 +131,24 @@ MonoPanner::on_expose_event (GdkEventExpose*)
{ {
Glib::RefPtr<Gdk::Window> win (get_window()); Glib::RefPtr<Gdk::Window> win (get_window());
Glib::RefPtr<Gdk::GC> gc (get_style()->get_base_gc (get_state())); Glib::RefPtr<Gdk::GC> gc (get_style()->get_base_gc (get_state()));
Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context(); Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context();
int width, height; int width, height;
double pos = position_control->get_value (); /* 0..1 */ double pos = position_control->get_value (); /* 0..1 */
uint32_t o, f, t, b, pf, po; uint32_t o, f, t, b, pf, po;
const double corner_radius = 5; const double corner_radius = 5;
width = get_width(); width = get_width();
height = get_height (); height = get_height ();
o = colors.outline; o = colors.outline;
f = colors.fill; f = colors.fill;
t = colors.text; t = colors.text;
b = colors.background; b = colors.background;
pf = colors.pos_fill; pf = colors.pos_fill;
po = colors.pos_outline; po = colors.pos_outline;
if (_panner_shell->bypassed()) { if (_panner_shell->bypassed()) {
b = 0x20202040; b = 0x20202040;
f = 0x404040ff; f = 0x404040ff;
o = 0x606060ff; o = 0x606060ff;
@ -157,121 +157,121 @@ MonoPanner::on_expose_event (GdkEventExpose*)
t = 0x606060ff; t = 0x606060ff;
} }
/* background */ /* background */
context->set_source_rgba (UINT_RGBA_R_FLT(b), UINT_RGBA_G_FLT(b), UINT_RGBA_B_FLT(b), UINT_RGBA_A_FLT(b)); context->set_source_rgba (UINT_RGBA_R_FLT(b), UINT_RGBA_G_FLT(b), UINT_RGBA_B_FLT(b), UINT_RGBA_A_FLT(b));
context->rectangle (0, 0, width, height); context->rectangle (0, 0, width, height);
context->fill (); context->fill ();
double usable_width = width - pos_box_size; double usable_width = width - pos_box_size;
/* compute the centers of the L/R boxes based on the current stereo width */ /* compute the centers of the L/R boxes based on the current stereo width */
if (fmod (usable_width,2.0) == 0) { if (fmod (usable_width,2.0) == 0) {
/* even width, but we need odd, so that there is an exact center. /* 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; usable_width -= 1.0;
context->translate (1.0, 0.0); context->translate (1.0, 0.0);
} }
const double half_lr_box = lr_box_size/2.0; const double half_lr_box = lr_box_size/2.0;
double left; double left;
double right; double right;
left = 4 + half_lr_box; // center of left box left = 4 + half_lr_box; // center of left box
right = width - 4 - half_lr_box; // center of right box right = width - 4 - half_lr_box; // center of right box
/* center line */ /* center line */
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_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->set_line_width (1.0);
context->move_to ((pos_box_size/2.0) + (usable_width/2.0), 0); 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->line_to ((pos_box_size/2.0) + (usable_width/2.0), height);
context->stroke (); context->stroke ();
/* left box */ /* left box */
rounded_rectangle (context, rounded_rectangle (context,
left - half_lr_box, left - half_lr_box,
half_lr_box+step_down, half_lr_box+step_down,
lr_box_size, lr_box_size, corner_radius); 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->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->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->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 (); context->fill ();
/* add text */ /* add text */
int tw, th; int tw, th;
Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create(get_pango_context()); Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create(get_pango_context());
layout->set_attributes (panner_font_attributes); layout->set_attributes (panner_font_attributes);
layout->set_text (_("L")); layout->set_text (_("L"));
layout->get_pixel_size(tw, th); layout->get_pixel_size(tw, th);
context->move_to (rint(left - tw/2), rint(lr_box_size + step_down - th/2)); context->move_to (rint(left - tw/2), rint(lr_box_size + step_down - th/2));
context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t)); context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
pango_cairo_show_layout (context->cobj(), layout->gobj()); pango_cairo_show_layout (context->cobj(), layout->gobj());
/* right box */ /* right box */
rounded_rectangle (context, rounded_rectangle (context,
right - half_lr_box, right - half_lr_box,
half_lr_box+step_down, half_lr_box+step_down,
lr_box_size, lr_box_size, corner_radius); 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->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->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->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 (); context->fill ();
/* add text */ /* add text */
layout->set_text (_("R")); layout->set_text (_("R"));
layout->get_pixel_size(tw, th); layout->get_pixel_size(tw, th);
context->move_to (rint(right - tw/2), rint(lr_box_size + step_down - th/2)); context->move_to (rint(right - tw/2), rint(lr_box_size + step_down - th/2));
context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t)); context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
pango_cairo_show_layout (context->cobj(), layout->gobj()); pango_cairo_show_layout (context->cobj(), layout->gobj());
/* 2 lines that connect them both */ /* 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_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->set_line_width (1.0);
/* make the lines a little longer than they need to be, because the corners of /* 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 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->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->line_to (right - half_lr_box + corner_radius, half_lr_box+step_down);
context->stroke (); context->stroke ();
context->move_to (left + half_lr_box - corner_radius, 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->line_to (right - half_lr_box + corner_radius, half_lr_box+step_down+lr_box_size);
context->stroke (); context->stroke ();
/* draw the position indicator */ /* draw the position indicator */
double spos = (pos_box_size/2.0) + (usable_width * pos); double spos = (pos_box_size/2.0) + (usable_width * pos);
context->set_line_width (2.0); context->set_line_width (2.0);
context->move_to (spos + (pos_box_size/2.0), top_step); /* top right */ context->move_to (spos + (pos_box_size/2.0), top_step); /* top right */
context->rel_line_to (0.0, pos_box_size); /* lower right */ context->rel_line_to (0.0, pos_box_size); /* lower right */
context->rel_line_to (-pos_box_size/2.0, 4.0); /* bottom point */ context->rel_line_to (-pos_box_size/2.0, 4.0); /* bottom point */
context->rel_line_to (-pos_box_size/2.0, -4.0); /* lower left */ context->rel_line_to (-pos_box_size/2.0, -4.0); /* lower left */
context->rel_line_to (0.0, -pos_box_size); /* upper left */ context->rel_line_to (0.0, -pos_box_size); /* upper left */
context->close_path (); context->close_path ();
context->set_source_rgba (UINT_RGBA_R_FLT(po), UINT_RGBA_G_FLT(po), UINT_RGBA_B_FLT(po), UINT_RGBA_A_FLT(po)); context->set_source_rgba (UINT_RGBA_R_FLT(po), UINT_RGBA_G_FLT(po), UINT_RGBA_B_FLT(po), UINT_RGBA_A_FLT(po));
context->stroke_preserve (); context->stroke_preserve ();
context->set_source_rgba (UINT_RGBA_R_FLT(pf), UINT_RGBA_G_FLT(pf), UINT_RGBA_B_FLT(pf), UINT_RGBA_A_FLT(pf)); context->set_source_rgba (UINT_RGBA_R_FLT(pf), UINT_RGBA_G_FLT(pf), UINT_RGBA_B_FLT(pf), UINT_RGBA_A_FLT(pf));
context->fill (); context->fill ();
/* marker line */ /* marker line */
context->set_line_width (1.0); context->set_line_width (1.0);
context->move_to (spos, pos_box_size+4); context->move_to (spos, pos_box_size+4);
context->rel_line_to (0, half_lr_box+step_down); context->rel_line_to (0, half_lr_box+step_down);
context->set_source_rgba (UINT_RGBA_R_FLT(po), UINT_RGBA_G_FLT(po), UINT_RGBA_B_FLT(po), UINT_RGBA_A_FLT(po)); context->set_source_rgba (UINT_RGBA_R_FLT(po), UINT_RGBA_G_FLT(po), UINT_RGBA_B_FLT(po), UINT_RGBA_A_FLT(po));
context->stroke (); context->stroke ();
/* done */ /* done */
return true; return true;
} }
@ -286,61 +286,61 @@ MonoPanner::on_button_press_event (GdkEventButton* ev)
return false; return false;
} }
drag_start_x = ev->x; drag_start_x = ev->x;
last_drag_x = ev->x; last_drag_x = ev->x;
_dragging = false; _dragging = false;
_tooltip.target_stop_drag (); _tooltip.target_stop_drag ();
accumulated_delta = 0; accumulated_delta = 0;
detented = false; detented = false;
/* Let the binding proxies get first crack at the press event /* Let the binding proxies get first crack at the press event
*/ */
if (ev->y < 20) { if (ev->y < 20) {
if (position_binder.button_press_handler (ev)) { if (position_binder.button_press_handler (ev)) {
return true; return true;
} }
} }
if (ev->button != 1) { if (ev->button != 1) {
return false; return false;
} }
if (ev->type == GDK_2BUTTON_PRESS) { if (ev->type == GDK_2BUTTON_PRESS) {
int width = get_width(); int width = get_width();
if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) { if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
/* handled by button release */ /* handled by button release */
return true; return true;
} }
if (ev->x <= width/3) { if (ev->x <= width/3) {
/* left side dbl click */ /* left side dbl click */
position_control->set_value (0); position_control->set_value (0);
} else if (ev->x > 2*width/3) { } else if (ev->x > 2*width/3) {
position_control->set_value (1.0); position_control->set_value (1.0);
} else { } else {
position_control->set_value (0.5); position_control->set_value (0.5);
} }
_dragging = false; _dragging = false;
_tooltip.target_stop_drag (); _tooltip.target_stop_drag ();
} else if (ev->type == GDK_BUTTON_PRESS) { } else if (ev->type == GDK_BUTTON_PRESS) {
if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) { if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
/* handled by button release */ /* handled by button release */
return true; return true;
} }
_dragging = true; _dragging = true;
_tooltip.target_start_drag (); _tooltip.target_start_drag ();
StartGesture (); StartGesture ();
} }
return true; return true;
} }
bool bool
@ -350,163 +350,163 @@ MonoPanner::on_button_release_event (GdkEventButton* ev)
return true; return true;
} }
if (ev->button != 1) { if (ev->button != 1) {
return false; return false;
} }
if (_panner_shell->bypassed()) { if (_panner_shell->bypassed()) {
return false; return false;
} }
_dragging = false; _dragging = false;
_tooltip.target_stop_drag (); _tooltip.target_stop_drag ();
accumulated_delta = 0; accumulated_delta = 0;
detented = false; detented = false;
if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) { if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
_panner->reset (); _panner->reset ();
} else { } else {
StopGesture (); StopGesture ();
} }
return true; return true;
} }
bool bool
MonoPanner::on_scroll_event (GdkEventScroll* ev) 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 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 pv = position_control->get_value(); // 0..1.0 ; 0 = left
double step; double step;
if (_panner_shell->bypassed()) { if (_panner_shell->bypassed()) {
return false; return false;
} }
if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
step = one_degree; step = one_degree;
} else { } else {
step = one_degree * 5.0; step = one_degree * 5.0;
} }
switch (ev->direction) { switch (ev->direction) {
case GDK_SCROLL_UP: case GDK_SCROLL_UP:
case GDK_SCROLL_LEFT: case GDK_SCROLL_LEFT:
pv -= step; pv -= step;
position_control->set_value (pv); position_control->set_value (pv);
break; break;
case GDK_SCROLL_DOWN: case GDK_SCROLL_DOWN:
case GDK_SCROLL_RIGHT: case GDK_SCROLL_RIGHT:
pv += step; pv += step;
position_control->set_value (pv); position_control->set_value (pv);
break; break;
} }
return true; return true;
} }
bool bool
MonoPanner::on_motion_notify_event (GdkEventMotion* ev) MonoPanner::on_motion_notify_event (GdkEventMotion* ev)
{ {
if (_panner_shell->bypassed()) { if (_panner_shell->bypassed()) {
_dragging = false; _dragging = false;
} }
if (!_dragging) { if (!_dragging) {
return false; return false;
} }
int w = get_width(); int w = get_width();
double delta = (ev->x - last_drag_x) / (double) w; double delta = (ev->x - last_drag_x) / (double) w;
/* create a detent close to the center */ /* create a detent close to the center */
if (!detented && ARDOUR::Panner::equivalent (position_control->get_value(), 0.5)) { if (!detented && ARDOUR::Panner::equivalent (position_control->get_value(), 0.5)) {
detented = true; detented = true;
/* snap to center */ /* snap to center */
position_control->set_value (0.5); position_control->set_value (0.5);
} }
if (detented) { if (detented) {
accumulated_delta += delta; accumulated_delta += delta;
/* have we pulled far enough to escape ? */ /* have we pulled far enough to escape ? */
if (fabs (accumulated_delta) >= 0.025) { if (fabs (accumulated_delta) >= 0.025) {
position_control->set_value (position_control->get_value() + accumulated_delta); position_control->set_value (position_control->get_value() + accumulated_delta);
detented = false; detented = false;
accumulated_delta = false; accumulated_delta = false;
} }
} else { } else {
double pv = position_control->get_value(); // 0..1.0 ; 0 = left double pv = position_control->get_value(); // 0..1.0 ; 0 = left
position_control->set_value (pv + delta); position_control->set_value (pv + delta);
} }
last_drag_x = ev->x; last_drag_x = ev->x;
return true; return true;
} }
bool bool
MonoPanner::on_key_press_event (GdkEventKey* ev) MonoPanner::on_key_press_event (GdkEventKey* ev)
{ {
double one_degree = 1.0/180.0; double one_degree = 1.0/180.0;
double pv = position_control->get_value(); // 0..1.0 ; 0 = left double pv = position_control->get_value(); // 0..1.0 ; 0 = left
double step; double step;
if (_panner_shell->bypassed()) { if (_panner_shell->bypassed()) {
return false; return false;
} }
if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
step = one_degree; step = one_degree;
} else { } else {
step = one_degree * 5.0; step = one_degree * 5.0;
} }
switch (ev->keyval) { switch (ev->keyval) {
case GDK_Left: case GDK_Left:
pv -= step; pv -= step;
position_control->set_value (pv); position_control->set_value (pv);
break; break;
case GDK_Right: case GDK_Right:
pv += step; pv += step;
position_control->set_value (pv); position_control->set_value (pv);
break; break;
case GDK_0: case GDK_0:
case GDK_KP_0: case GDK_KP_0:
position_control->set_value (0.0); position_control->set_value (0.0);
break; break;
default: default:
return false; return false;
} }
return true; return true;
} }
void void
MonoPanner::set_colors () MonoPanner::set_colors ()
{ {
colors.fill = ARDOUR_UI::config()->canvasvar_MonoPannerFill.get(); colors.fill = ARDOUR_UI::config()->canvasvar_MonoPannerFill.get();
colors.outline = ARDOUR_UI::config()->canvasvar_MonoPannerOutline.get(); colors.outline = ARDOUR_UI::config()->canvasvar_MonoPannerOutline.get();
colors.text = ARDOUR_UI::config()->canvasvar_MonoPannerText.get(); colors.text = ARDOUR_UI::config()->canvasvar_MonoPannerText.get();
colors.background = ARDOUR_UI::config()->canvasvar_MonoPannerBackground.get(); colors.background = ARDOUR_UI::config()->canvasvar_MonoPannerBackground.get();
colors.pos_outline = ARDOUR_UI::config()->canvasvar_MonoPannerPositionOutline.get(); colors.pos_outline = ARDOUR_UI::config()->canvasvar_MonoPannerPositionOutline.get();
colors.pos_fill = ARDOUR_UI::config()->canvasvar_MonoPannerPositionFill.get(); colors.pos_fill = ARDOUR_UI::config()->canvasvar_MonoPannerPositionFill.get();
} }
void void
MonoPanner::color_handler () MonoPanner::color_handler ()
{ {
set_colors (); set_colors ();
queue_draw (); queue_draw ();
} }
void void
MonoPanner::bypass_handler () MonoPanner::bypass_handler ()
{ {
queue_draw (); queue_draw ();
} }
PannerEditor* PannerEditor*
MonoPanner::editor () MonoPanner::editor ()
{ {
return new MonoPannerEditor (this); return new MonoPannerEditor (this);