diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-13 08:20:01 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-13 08:20:01 -0400 |
| commit | 745501b6f3ad93cda419d2d9f56d212e34b80c17 (patch) | |
| tree | d9e3e97f6aa434790d8b13f4aa1cc9ae499c6d8b /gtk2_ardour/panner2d.cc | |
| parent | aa4dd3443ffd3cb4639c69dc72214a3f5b758071 (diff) | |
Fix for small identifier being defined on windows/mingw
Diffstat (limited to 'gtk2_ardour/panner2d.cc')
| -rw-r--r-- | gtk2_ardour/panner2d.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index 64d83ab162..395cd2f5dd 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -390,7 +390,7 @@ Panner2d::on_expose_event (GdkEventExpose *event) { CartesianVector c; cairo_t* cr; - bool small = (height <= large_size_threshold); + bool small_size = (height <= large_size_threshold); const double diameter = radius*2.0; cr = gdk_cairo_create (get_window()->gobj()); @@ -473,7 +473,7 @@ Panner2d::on_expose_event (GdkEventExpose *event) cairo_select_font_face (cr, "sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); - if (small) { + if (small_size) { arc_radius = 4.0; } else { cairo_set_font_size (cr, 10); @@ -498,10 +498,10 @@ Panner2d::on_expose_event (GdkEventExpose *event) cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, 1.0); cairo_stroke (cr); - if (!small && !signal->text.empty()) { + if (!small_size && !signal->text.empty()) { cairo_set_source_rgb (cr, 0.517, 0.772, 0.882); /* the +/- adjustments are a hack to try to center the text in the circle */ - if (small) { + if (small_size) { cairo_move_to (cr, c.x - 1, c.y + 1); } else { cairo_move_to (cr, c.x - 4, c.y + 4); @@ -535,7 +535,7 @@ Panner2d::on_expose_event (GdkEventExpose *event) cairo_move_to (cr, c.x, c.y); cairo_save (cr); cairo_rotate (cr, -(speaker->position.azi/360.0) * (2.0 * M_PI)); - if (small) { + if (small_size) { cairo_scale (cr, 0.8, 0.8); } else { cairo_scale (cr, 1.2, 1.2); @@ -553,7 +553,7 @@ Panner2d::on_expose_event (GdkEventExpose *event) cairo_fill (cr); cairo_restore (cr); - if (!small) { + if (!small_size) { cairo_set_font_size (cr, 16); /* move the text in just a bit */ |