From 74e21e942eed80156c4e05491983454361edd97a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 28 May 2021 12:18:38 -0400 Subject: [PATCH] Remove unused variables (Wunused-variable) --- gtk2_ardour/editor_rulers.cc | 1 - libs/ardour/import_pt.cc | 1 - libs/ardour/io.cc | 1 - libs/ardour/playlist.cc | 1 - libs/ardour/session.cc | 2 -- libs/ardour/vst_plugin.cc | 1 - libs/surfaces/cc121/cc121.cc | 1 - libs/surfaces/cc121/operations.cc | 5 ----- libs/surfaces/faderport/faderport.cc | 1 - libs/surfaces/faderport8/faderport8.cc | 1 - libs/surfaces/generic_midi/generic_midi_control_protocol.cc | 1 - 11 files changed, 16 deletions(-) diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 186af8a8dd..d80950b3d9 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -977,7 +977,6 @@ Editor::compute_bbt_ruler_scale (samplepos_t lower, samplepos_t upper) return; } - std::vector::const_iterator i; Timecode::BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler double floor_lower_beat = floor(std::max (0.0, _session->tempo_map().beat_at_sample (lower))); diff --git a/libs/ardour/import_pt.cc b/libs/ardour/import_pt.cc index 604fd0016c..226d8b18fe 100644 --- a/libs/ardour/import_pt.cc +++ b/libs/ardour/import_pt.cc @@ -278,7 +278,6 @@ Session::import_pt_rest (PTFFormat& ptf) uint32_t srate = sample_rate (); vector ptfregpair; - vector::const_iterator w; SourceList just_one_src; diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 9b567e841d..7aabcd11bf 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -650,7 +650,6 @@ int IO::set_state_2X (const XMLNode& node, int version, bool in) { XMLProperty const * prop; - XMLNodeConstIterator iter; LocaleGuard lg; /* force use of non-localized representation of decimal point, diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 31c89292cd..950206e88b 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -2302,7 +2302,6 @@ Playlist::set_state (const XMLNode& node, int version) XMLNode* child; XMLNodeList nlist; XMLNodeConstIterator niter; - XMLPropertyConstIterator piter; boost::shared_ptr region; string region_name; bool seen_region_nodes = false; diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 3785e2ef3b..60d4583c73 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -4746,7 +4746,6 @@ bool Session::audio_source_name_is_unique (const string& name) { std::vector sdirs = source_search_path (DataType::AUDIO); - vector::iterator i; uint32_t existing = 0; for (vector::const_iterator i = sdirs.begin(); i != sdirs.end(); ++i) { @@ -4890,7 +4889,6 @@ Session::new_midi_source_path (const string& base, bool need_lock) while (true) { possible_name = bump_name_once (possible_name, '-'); - vector::iterator i; uint32_t existing = 0; for (vector::const_iterator i = sdirs.begin(); i != sdirs.end(); ++i) { diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc index af41523138..5637f3e9ec 100644 --- a/libs/ardour/vst_plugin.cc +++ b/libs/ardour/vst_plugin.cc @@ -323,7 +323,6 @@ VSTPlugin::set_state (const XMLNode& node, int version) _plugin->dispatcher (_plugin, effSetProgram, 0, pgm, NULL, 0); }; - XMLPropertyList::const_iterator i; XMLNodeList::const_iterator n; for (n = child->children ().begin (); n != child->children ().end (); ++n) { diff --git a/libs/surfaces/cc121/cc121.cc b/libs/surfaces/cc121/cc121.cc index c72eed653c..8c4884f267 100644 --- a/libs/surfaces/cc121/cc121.cc +++ b/libs/surfaces/cc121/cc121.cc @@ -758,7 +758,6 @@ int CC121::set_state (const XMLNode& node, int version) { XMLNodeList nlist; - XMLNodeConstIterator niter; XMLNode const* child; if (ControlProtocol::set_state (node, version)) { diff --git a/libs/surfaces/cc121/operations.cc b/libs/surfaces/cc121/operations.cc index c5678569f0..d06edaf480 100644 --- a/libs/surfaces/cc121/operations.cc +++ b/libs/surfaces/cc121/operations.cc @@ -35,11 +35,6 @@ using namespace ARDOUR; using namespace ArdourSurface; using namespace PBD; -/* this value is chosen to given smooth motion from 0..1.0 in about 270 degrees - * of encoder rotation. - */ -static const double encoder_divider = 24.0; - void CC121::input_monitor () { diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc index 835488f506..78e31cb348 100644 --- a/libs/surfaces/faderport/faderport.cc +++ b/libs/surfaces/faderport/faderport.cc @@ -790,7 +790,6 @@ int FaderPort::set_state (const XMLNode& node, int version) { XMLNodeList nlist; - XMLNodeConstIterator niter; XMLNode const* child; if (ControlProtocol::set_state (node, version)) { diff --git a/libs/surfaces/faderport8/faderport8.cc b/libs/surfaces/faderport8/faderport8.cc index 3fb0687941..09c06125f5 100644 --- a/libs/surfaces/faderport8/faderport8.cc +++ b/libs/surfaces/faderport8/faderport8.cc @@ -808,7 +808,6 @@ FaderPort8::set_state (const XMLNode& node, int version) { DEBUG_TRACE (DEBUG::FaderPort8, "FaderPort8::set_state\n"); XMLNodeList nlist; - XMLNodeConstIterator niter; XMLNode const* child; if (ControlProtocol::set_state (node, version)) { diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index 13fca86e0b..549718647c 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -803,7 +803,6 @@ GenericMidiControlProtocol::load_bindings (const string& xmlpath) const XMLNodeList& children (root->children()); XMLNodeConstIterator citer; - XMLNodeConstIterator gciter; MIDIControllable* mc;