From 885f1c71ec62dbfa2250d8821e698dfe01be93d7 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 31 Aug 2014 17:45:20 -0400 Subject: [PATCH] Remove unused variables (fix warnings). --- gtk2_ardour/editor_canvas.cc | 8 ++------ gtk2_ardour/editor_routes.cc | 2 -- gtk2_ardour/mixer_strip.cc | 2 -- gtk2_ardour/verbose_cursor.cc | 1 - libs/ardour/midi_scene_changer.cc | 2 -- libs/gtkmm2ext/motionfeedback.cc | 32 ++++++++++--------------------- wscript | 2 +- 7 files changed, 13 insertions(+), 36 deletions(-) diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 66caeb7bc6..bf97bb73fc 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -517,14 +517,11 @@ Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert, bool from_headers) ArdourCanvas::Rect scrolling_boundary; Gtk::Allocation alloc; - int cx, cy; if (from_headers) { alloc = controls_layout.get_allocation (); } else { alloc = _track_canvas_viewport->get_allocation (); - cx = alloc.get_x(); - cy = alloc.get_y(); /* reduce height by the height of the timebars, which happens to correspond to the position of the hv_scroll_group. @@ -581,7 +578,6 @@ Editor::autoscroll_canvas () Gdk::ModifierType mask; frameoffset_t dx = 0; bool no_stop = false; - bool y_motion = false; get_window()->get_pointer (x, y, mask); @@ -644,14 +640,14 @@ Editor::autoscroll_canvas () /* scroll to make higher tracks visible */ if (autoscroll_cnt && (autoscroll_cnt % speed_factor == 0)) { - y_motion = scroll_up_one_track (); + scroll_up_one_track (); vertical_motion = true; } } else if (y > autoscroll_boundary.y1) { if (autoscroll_cnt && (autoscroll_cnt % speed_factor == 0)) { - y_motion = scroll_down_one_track (); + scroll_down_one_track (); vertical_motion = true; } } diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index 8372287509..1ca8cf2a65 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -735,13 +735,11 @@ EditorRoutes::route_removed (TimeAxisView *tv) TreeModel::Children rows = _model->children(); TreeModel::Children::iterator ri; - bool found = false; for (ri = rows.begin(); ri != rows.end(); ++ri) { if ((*ri)[_columns.tv] == tv) { PBD::Unwinder uw (_route_deletion_in_progress, true); _model->erase (ri); - found = true; break; } } diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index c343b298c3..3d0059fa6e 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -136,8 +136,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt void MixerStrip::init () { - int button_table_row = 0; - _entered_mixer_strip= 0; group_menu = 0; route_ops_menu = 0; diff --git a/gtk2_ardour/verbose_cursor.cc b/gtk2_ardour/verbose_cursor.cc index 7410792e55..4973cee0b3 100644 --- a/gtk2_ardour/verbose_cursor.cc +++ b/gtk2_ardour/verbose_cursor.cc @@ -137,7 +137,6 @@ VerboseCursor::set_duration (framepos_t start, framepos_t end) Timecode::Time timecode; Timecode::BBT_Time sbbt; Timecode::BBT_Time ebbt; - framepos_t frame_rate; Meter meter_at_start (_editor->_session->tempo_map().meter_at(start)); if (_editor->_session == 0) { 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 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); diff --git a/wscript b/wscript index 68054f54d3..47157aa198 100644 --- a/wscript +++ b/wscript @@ -359,7 +359,7 @@ def set_compiler_flags (conf,opt): # compiler_flags.extend( - ('-Wall', '-Wpointer-arith', '-Wcast-qual', '-Wcast-align')) + ('-Wall', '-Wpointer-arith', '-Wcast-qual', '-Wcast-align', '-Wno-unused-parameter')) c_flags.extend(('-Wstrict-prototypes', '-Wmissing-prototypes')) cxx_flags.append('-Woverloaded-virtual') -- 2.30.2