From 98d994f29c968796c5e9822e7c3b1713e53b274d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 2 Sep 2010 17:01:36 +0000 Subject: fix a variety of unused argument errors noted by gcc 4.3.2 on x86 git-svn-id: svn://localhost/ardour2/branches/3.0@7733 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui2.cc | 4 ++-- gtk2_ardour/ardour_ui_ed.cc | 4 ++-- gtk2_ardour/audio_region_view.cc | 2 +- gtk2_ardour/editor.cc | 4 +--- gtk2_ardour/editor_canvas_events.cc | 2 +- gtk2_ardour/editor_selection.cc | 2 +- gtk2_ardour/editor_tempodisplay.cc | 2 +- gtk2_ardour/gtk_pianokeyboard.c | 2 +- gtk2_ardour/region_editor.cc | 2 +- gtk2_ardour/region_layering_order_editor.cc | 2 +- gtk2_ardour/return_ui.cc | 2 +- gtk2_ardour/rhythm_ferret.cc | 4 ++-- gtk2_ardour/route_params_ui.cc | 3 +-- gtk2_ardour/route_ui.cc | 2 +- gtk2_ardour/send_ui.cc | 4 ++-- gtk2_ardour/startup.cc | 2 +- gtk2_ardour/step_entry.cc | 4 ++-- libs/ardour/ardour/processor.h | 2 +- libs/ardour/ardour/region.h | 8 ++++---- libs/ardour/audioengine.cc | 2 +- libs/ardour/import.cc | 4 ++-- libs/ardour/midi_track.cc | 2 +- libs/ardour/port_set.cc | 2 +- libs/ardour/region.cc | 4 ++-- libs/ardour/route_group.cc | 6 +++--- libs/audiographer/src/general/sample_format_converter.cc | 2 +- libs/evoral/evoral/Sequence.hpp | 2 +- libs/evoral/src/Sequence.cpp | 4 ++-- libs/surfaces/generic_midi/midiaction.cc | 2 +- libs/surfaces/generic_midi/midicontrollable.cc | 2 +- libs/surfaces/generic_midi/midifunction.cc | 2 +- 31 files changed, 44 insertions(+), 47 deletions(-) diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 9b975a7461..e81b5f675d 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -518,7 +518,7 @@ ARDOUR_UI::auditioning_changed (bool onoff) } bool -ARDOUR_UI::audition_alert_press (GdkEventButton* ev) +ARDOUR_UI::audition_alert_press (GdkEventButton*) { if (_session) { _session->cancel_audition(); @@ -527,7 +527,7 @@ ARDOUR_UI::audition_alert_press (GdkEventButton* ev) } bool -ARDOUR_UI::solo_alert_press (GdkEventButton* ev) +ARDOUR_UI::solo_alert_press (GdkEventButton*) { if (_session) { if (_session->soloing()) { diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index e493de0be2..0c67d4b59d 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -629,7 +629,7 @@ ARDOUR_UI::float_big_clock (Gtk::Window* parent) } void -ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation& allocation) +ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation&) { if (!big_clock_resize_in_progress) { Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::idle_big_clock_text_resizer), 0, 0)); @@ -638,7 +638,7 @@ ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation& allocation) } bool -ARDOUR_UI::idle_big_clock_text_resizer (int win_w, int win_h) +ARDOUR_UI::idle_big_clock_text_resizer (int, int) { big_clock_resize_in_progress = false; diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index c16bea4109..26af5ca777 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1463,7 +1463,7 @@ AudioRegionView::transients_changed () } void -AudioRegionView::update_transient(float old_pos, float new_pos) +AudioRegionView::update_transient(float /*old_pos*/, float new_pos) { /* Find frame at old pos, calulate new frame then update region transients*/ list >::iterator l; diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 43c418d4e4..58f66fcd8a 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4208,10 +4208,8 @@ Editor::control_layout_scroll (GdkEventScroll* ev) } void -Editor::session_state_saved (string snap_name) +Editor::session_state_saved (string) { - ENSURE_GUI_THREAD (*this, &Editor::session_state_saved, snap_name); - update_title (); _snapshots->redisplay (); } diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index a746883495..9b688adc45 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -901,7 +901,7 @@ Editor::canvas_region_view_name_event (GdkEvent *event, ArdourCanvas::Item* item } bool -Editor::canvas_feature_line_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView *rv) +Editor::canvas_feature_line_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView*) { bool ret = false; diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 893adf0262..065145c417 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -174,7 +174,7 @@ Editor::select_all_tracks () * tracks, in which case nothing will happen unless `force' is true. */ void -Editor::set_selected_track_as_side_effect (Selection::Operation op, bool force) +Editor::set_selected_track_as_side_effect (Selection::Operation op, bool /*force*/) { if (!clicked_axisview) { return; diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 048c0d2ccb..65432c3754 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -94,7 +94,7 @@ Editor::draw_metric_marks (const Metrics& metrics) } void -Editor::tempo_map_changed (const PropertyChange& ignored) +Editor::tempo_map_changed (const PropertyChange& /*ignored*/) { if (!_session) { return; diff --git a/gtk2_ardour/gtk_pianokeyboard.c b/gtk2_ardour/gtk_pianokeyboard.c index ffeb87be82..4e91c0a671 100644 --- a/gtk2_ardour/gtk_pianokeyboard.c +++ b/gtk2_ardour/gtk_pianokeyboard.c @@ -523,7 +523,7 @@ piano_keyboard_expose(GtkWidget *widget, GdkEventExpose *event) } static void -piano_keyboard_size_request(GtkWidget *widget, GtkRequisition *requisition) +piano_keyboard_size_request(GtkWidget* widget, GtkRequisition *requisition) { requisition->width = PIANO_KEYBOARD_DEFAULT_WIDTH; requisition->height = PIANO_KEYBOARD_DEFAULT_HEIGHT; diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc index 14ea34c306..370859381f 100755 --- a/gtk2_ardour/region_editor.cc +++ b/gtk2_ardour/region_editor.cc @@ -377,7 +377,7 @@ RegionEditor::sync_offset_relative_clock_changed () } bool -RegionEditor::on_delete_event (GdkEventAny* ev) +RegionEditor::on_delete_event (GdkEventAny*) { PropertyChange change; diff --git a/gtk2_ardour/region_layering_order_editor.cc b/gtk2_ardour/region_layering_order_editor.cc index f6bc74a6ff..7db480d5aa 100644 --- a/gtk2_ardour/region_layering_order_editor.cc +++ b/gtk2_ardour/region_layering_order_editor.cc @@ -87,7 +87,7 @@ RegionLayeringOrderEditor::~RegionLayeringOrderEditor () } void -RegionLayeringOrderEditor::row_activated (const TreeModel::Path& path, TreeViewColumn* column) +RegionLayeringOrderEditor::row_activated (const TreeModel::Path& path, TreeViewColumn*) { if (in_row_change) { return; diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc index 6e131c3b58..d279aa55f4 100644 --- a/gtk2_ardour/return_ui.cc +++ b/gtk2_ardour/return_ui.cc @@ -79,7 +79,7 @@ ReturnUI::~ReturnUI () } void -ReturnUI::ins_changed (IOChange change, void* ignored) +ReturnUI::ins_changed (IOChange change, void* /*ignored*/) { ENSURE_GUI_THREAD (*this, &ReturnUI::ins_changed, change, ignored) if (change.type & IOChange::ConfigurationChanged) { diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc index cba0042cfe..956a012697 100644 --- a/gtk2_ardour/rhythm_ferret.cc +++ b/gtk2_ardour/rhythm_ferret.cc @@ -212,7 +212,7 @@ RhythmFerret::run_analysis () } int -RhythmFerret::run_percussion_onset_analysis (boost::shared_ptr readable, nframes64_t offset, AnalysisFeatureList& results) +RhythmFerret::run_percussion_onset_analysis (boost::shared_ptr readable, nframes64_t /*offset*/, AnalysisFeatureList& results) { TransientDetector t (_session->frame_rate()); @@ -265,7 +265,7 @@ RhythmFerret::get_note_onset_function () } int -RhythmFerret::run_note_onset_analysis (boost::shared_ptr readable, nframes64_t offset, AnalysisFeatureList& results) +RhythmFerret::run_note_onset_analysis (boost::shared_ptr readable, nframes64_t /*offset*/, AnalysisFeatureList& results) { try { OnsetDetector t (_session->frame_rate()); diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index 1c57268fb3..c9304d19cc 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -488,9 +488,8 @@ RouteParams_UI::route_selected() } void -RouteParams_UI::processors_changed (RouteProcessorChange c) +RouteParams_UI::processors_changed (RouteProcessorChange) { - ENSURE_GUI_THREAD (*this, &RouteParams_UI::processors_changed, c) cleanup_view(); _processor.reset ((Processor*) 0); diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 9f2873bb23..60d6f5f263 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -1204,7 +1204,7 @@ RouteUI::solo_isolate_button_release (GdkEventButton* ev) } bool -RouteUI::solo_safe_button_release (GdkEventButton* ev) +RouteUI::solo_safe_button_release (GdkEventButton*) { _route->set_solo_safe (!(solo_safe_led->visual_state() > 0), this); return true; diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc index 9638897f3b..490d99867c 100644 --- a/gtk2_ardour/send_ui.cc +++ b/gtk2_ardour/send_ui.cc @@ -89,7 +89,7 @@ SendUI::~SendUI () } void -SendUI::ins_changed (IOChange change, void* ignored) +SendUI::ins_changed (IOChange change, void* /*ignored*/) { ENSURE_GUI_THREAD (*this, &SendUI::ins_changed, change, ignored) if (change.type & IOChange::ConfigurationChanged) { @@ -98,7 +98,7 @@ SendUI::ins_changed (IOChange change, void* ignored) } void -SendUI::outs_changed (IOChange change, void* ignored) +SendUI::outs_changed (IOChange change, void* /*ignored*/) { ENSURE_GUI_THREAD (*this, &SendUI::outs_changed, change, ignored) if (change.type & IOChange::ConfigurationChanged) { diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index d941b66d42..02e301b940 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -621,7 +621,7 @@ ArdourStartup::populate_session_templates () } static bool -lost_name_entry_focus (GdkEventFocus* ev) +lost_name_entry_focus (GdkEventFocus*) { cerr << "lost focus\n"; return false; diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index 1fd6b37cfb..3caada4b89 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -45,13 +45,13 @@ using namespace PBD; using namespace ARDOUR; static void -_note_off_event_handler (GtkWidget* widget, int note, gpointer arg) +_note_off_event_handler (GtkWidget* /*widget*/, int note, gpointer arg) { ((StepEntry*)arg)->note_off_event_handler (note); } static void -_rest_event_handler (GtkWidget* widget, gpointer arg) +_rest_event_handler (GtkWidget* /*widget*/, gpointer arg) { ((StepEntry*)arg)->rest_event_handler (); } diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h index 55e0cfb2d6..fe1b4bb6cd 100644 --- a/libs/ardour/ardour/processor.h +++ b/libs/ardour/ardour/processor.h @@ -69,7 +69,7 @@ class Processor : public SessionObject, public Automatable, public Latent /** @param result_required true if, on return from this method, bufs is required to contain valid data; * if false, the method need not bother writing to bufs if it doesn't want to. */ - virtual void run (BufferSet& /*bufs*/, framepos_t /*start_frame*/, framepos_t /*end_frame*/, nframes_t /*nframes*/, bool result_required) {} + virtual void run (BufferSet& /*bufs*/, framepos_t /*start_frame*/, framepos_t /*end_frame*/, nframes_t /*nframes*/, bool /*result_required*/) {} virtual void silence (nframes_t /*nframes*/) {} virtual void activate () { _pending_active = true; ActiveChanged(); } diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 3dbcc55570..b09e89d3a0 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -247,16 +247,16 @@ class Region virtual int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&) = 0; - virtual void add_transient (nframes64_t where) { + virtual void add_transient (nframes64_t) { // no transients, but its OK } - virtual int update_transient (nframes64_t old_position, nframes64_t new_position) { + virtual int update_transient (nframes64_t /* old_position */, nframes64_t /* new_position */) { // no transients, but its OK return 0; } - virtual void remove_transient (nframes64_t where) { + virtual void remove_transient (nframes64_t /* where */) { // no transients, but its OK } @@ -271,7 +271,7 @@ class Region return 0; } - virtual int adjust_transients (nframes64_t delta) { + virtual int adjust_transients (nframes64_t /*delta*/) { // no transients, but its OK return 0; } diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 9a946a1c0a..bfdd9acd26 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -416,7 +416,7 @@ AudioEngine::split_cycle (nframes_t offset) } void -AudioEngine::finish_process_cycle (int status) +AudioEngine::finish_process_cycle (int /* status*/ ) { GET_PRIVATE_JACK_POINTER(_jack); jack_cycle_signal (_jack, 0); diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index c3352a6127..d1a4a5cad4 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -244,8 +244,8 @@ static Glib::ustring compose_status_message (const string& path, uint file_samplerate, uint session_samplerate, - uint current_file, - uint total_files) + uint /* current_file */, + uint /* total_files */) { if (file_samplerate != session_samplerate) { return string_compose (_("Resampling %1 from %2kHz to %3kHz"), diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index f79ed520c0..2bac842655 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -605,7 +605,7 @@ MidiTrack::set_midi_thru (bool yn) } boost::shared_ptr -MidiTrack::write_source (uint32_t n) +MidiTrack::write_source (uint32_t) { return midi_diskstream()->write_source (); } diff --git a/libs/ardour/port_set.cc b/libs/ardour/port_set.cc index 7648db00cb..a5fbc9eee6 100644 --- a/libs/ardour/port_set.cc +++ b/libs/ardour/port_set.cc @@ -36,7 +36,7 @@ static bool sort_ports_by_name (Port* a, Port* b) Glib::ustring bname (b->name()); Glib::ustring::size_type last_digit_position_a = aname.size(); - Glib::ustring::const_reverse_iterator r_iterator = aname.rbegin(); + Glib::ustring::reverse_iterator r_iterator = aname.rbegin(); while (r_iterator!= aname.rend() && Glib::Unicode::isdigit(*r_iterator)) { r_iterator++; diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 43506c78be..9a54139d09 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -835,7 +835,7 @@ Region::modify_front (nframes_t new_position, bool reset_fade, void *src) } void -Region::modify_end (nframes_t new_endpoint, bool reset_fade, void *src) +Region::modify_end (nframes_t new_endpoint, bool reset_fade, void* /*src*/) { if (locked()) { return; @@ -1217,7 +1217,7 @@ Region::set_state (const XMLNode& node, int version) } int -Region::_set_state (const XMLNode& node, int version, PropertyChange& what_changed, bool send) +Region::_set_state (const XMLNode& node, int /*version*/, PropertyChange& what_changed, bool send) { const XMLProperty* prop; diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc index f1631e4375..9dbdad33d4 100644 --- a/libs/ardour/route_group.cc +++ b/libs/ardour/route_group.cc @@ -334,7 +334,7 @@ RouteGroup::set_edit (bool yn) } void -RouteGroup::set_active (bool yn, void *src) +RouteGroup::set_active (bool yn, void* /*src*/) { if (is_active() == yn) { return; @@ -347,7 +347,7 @@ RouteGroup::set_active (bool yn, void *src) } void -RouteGroup::set_relative (bool yn, void *src) +RouteGroup::set_relative (bool yn, void* /*src*/) { if (is_relative() == yn) { return; @@ -357,7 +357,7 @@ RouteGroup::set_relative (bool yn, void *src) } void -RouteGroup::set_hidden (bool yn, void *src) +RouteGroup::set_hidden (bool yn, void* /*src*/) { if (is_hidden() == yn) { return; diff --git a/libs/audiographer/src/general/sample_format_converter.cc b/libs/audiographer/src/general/sample_format_converter.cc index 5f63fe9f2f..a827f67078 100644 --- a/libs/audiographer/src/general/sample_format_converter.cc +++ b/libs/audiographer/src/general/sample_format_converter.cc @@ -21,7 +21,7 @@ SampleFormatConverter::SampleFormatConverter (ChannelCount channels) : template <> void -SampleFormatConverter::init (nframes_t max_frames, int type, int data_width) +SampleFormatConverter::init (nframes_t max_frames, int /* type */, int data_width) { if (throw_level (ThrowObject) && data_width != 32) { throw Exception (*this, "Unsupported data width"); diff --git a/libs/evoral/evoral/Sequence.hpp b/libs/evoral/evoral/Sequence.hpp index 6c6c58357f..7675aeeb4e 100644 --- a/libs/evoral/evoral/Sequence.hpp +++ b/libs/evoral/evoral/Sequence.hpp @@ -254,7 +254,7 @@ protected: mutable Glib::RWLock _lock; bool _writing; - virtual int resolve_overlaps_unlocked (const NotePtr, void* arg = 0) { + virtual int resolve_overlaps_unlocked (const NotePtr, void* /* arg */ = 0) { return 0; } diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index 8815071433..36758c3274 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -817,7 +817,7 @@ Sequence