summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2014-08-31 17:45:20 -0400
committerDavid Robillard <d@drobilla.net>2014-08-31 17:54:16 -0400
commit885f1c71ec62dbfa2250d8821e698dfe01be93d7 (patch)
treee9d3c92e9ece7a550757fdf4d5bb88eb5143ecf2 /libs
parentc95c221493e03ee029223531d459c14b4d4d392d (diff)
Remove unused variables (fix warnings).
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/midi_scene_changer.cc2
-rw-r--r--libs/gtkmm2ext/motionfeedback.cc32
2 files changed, 10 insertions, 24 deletions
diff --git a/libs/ardour/midi_scene_changer.cc b/libs/ardour/midi_scene_changer.cc
index fcc20b850f..88a9e8db35 100644
--- a/libs/ardour/midi_scene_changer.cc
+++ b/libs/ardour/midi_scene_changer.cc
@@ -168,7 +168,6 @@ void
MIDISceneChanger::locate (framepos_t pos)
{
boost::shared_ptr<MIDISceneChange> msc;
- framepos_t when;
{
Glib::Threads::RWLock::ReaderLock lm (scene_lock);
@@ -196,7 +195,6 @@ MIDISceneChanger::locate (framepos_t pos)
--i;
}
- when = i->first;
msc = i->second;
}
diff --git a/libs/gtkmm2ext/motionfeedback.cc b/libs/gtkmm2ext/motionfeedback.cc
index 1d59bcf0ec..25ae7b3ca2 100644
--- a/libs/gtkmm2ext/motionfeedback.cc
+++ b/libs/gtkmm2ext/motionfeedback.cc
@@ -553,44 +553,32 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double size, double progress_
double progress_radius;
double progress_radius_inner;
double progress_radius_outer;
- double knob_disc_radius;
- cairo_pattern_t* pattern;
- double progress_rim_width;
- cairo_pattern_t* progress_shine;
- double degrees;
- cairo_pattern_t* knob_ripples;
- double pxs;
- double pys;
g_return_if_fail (cr != NULL);
progress_radius = 40.0;
progress_radius_inner = progress_radius - (progress_width / 2.0);
progress_radius_outer = progress_radius + (progress_width / 2.0);
- knob_disc_radius = progress_radius_inner - 5.0;
- const double pad = 2.0; /* line width for boundary of progress ring */
- const double actual_width = ((2.0 * pad) + (2.0 * progress_radius_outer));
- const double scale_factor = size / actual_width;
+ const double pad = 2.0; /* line width for boundary of progress ring */
+ const double actual_width = ((2.0 * pad) + (2.0 * progress_radius_outer));
+ const double scale_factor = size / actual_width;
- /* knob center is at middle of the area bounded by (xorigin,yorigin) and (xorigin+size, yorigin+size)
- but the coordinates will be scaled by the scale factor when cairo uses them so first
- adjust them by the reciprocal of the scale factor.
- */
+ /* knob center is at middle of the area bounded by (xorigin,yorigin) and (xorigin+size, yorigin+size)
+ but the coordinates will be scaled by the scale factor when cairo uses them so first
+ adjust them by the reciprocal of the scale factor.
+ */
xc = (xorigin + (size / 2.0)) * (1.0/scale_factor);
- yc = (yorigin + (size / 2.0)) * (1.0/scale_factor);
-
- pxs = xorigin * (1.0/scale_factor);
- pys = yorigin * (1.0/scale_factor);
+ yc = (yorigin + (size / 2.0)) * (1.0/scale_factor);
start_angle = 0.0;
end_angle = 0.0;
value_angle = 0.0;
value = (phase * 1.0) / (65 - 1);
- start_angle = ((180 - 65) * G_PI) / 180;
- end_angle = ((360 + 65) * G_PI) / 180;
+ start_angle = ((180 - 65) * G_PI) / 180;
+ end_angle = ((360 + 65) * G_PI) / 180;
value_angle = start_angle + (value * (end_angle - start_angle));
value_x = cos (value_angle);