From 0938a42440cc82ce8d0cb064840c258c863714ab Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 30 Sep 2011 17:55:14 +0000 Subject: [PATCH] fixes for 98% of all the warnings/errors reported by OS X gcc on tiger git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui.cc | 2 +- gtk2_ardour/ardour_ui.h | 4 ++ gtk2_ardour/au_pluginui.mm | 6 +-- gtk2_ardour/audio_clock.cc | 2 +- gtk2_ardour/audio_region_editor.cc | 5 +-- gtk2_ardour/automation_time_axis.cc | 2 +- gtk2_ardour/canvas-simpleline.c | 3 +- gtk2_ardour/editor_canvas.cc | 4 +- gtk2_ardour/editor_canvas_events.cc | 2 +- gtk2_ardour/editor_drag.cc | 2 +- gtk2_ardour/editor_mouse.cc | 10 ++--- gtk2_ardour/editor_ops.cc | 2 +- gtk2_ardour/editor_regions.cc | 4 +- gtk2_ardour/editor_rulers.cc | 2 +- gtk2_ardour/editor_selection.cc | 2 +- gtk2_ardour/gain_meter.cc | 2 +- gtk2_ardour/group_tabs.cc | 4 +- gtk2_ardour/gtk_pianokeyboard.c | 6 +-- gtk2_ardour/location_ui.cc | 2 +- gtk2_ardour/midi_region_view.cc | 4 +- gtk2_ardour/mixer_strip.cc | 2 +- gtk2_ardour/monitor_section.cc | 2 +- gtk2_ardour/mono_panner.cc | 6 +-- gtk2_ardour/panner2d.cc | 2 +- gtk2_ardour/region_view.cc | 2 +- gtk2_ardour/route_time_axis.cc | 4 +- gtk2_ardour/shuttle_control.cc | 2 +- gtk2_ardour/stereo_panner.cc | 4 +- gtk2_ardour/time_axis_view.cc | 2 +- gtk2_ardour/time_axis_view_item.cc | 2 +- libs/appleutility/CAAudioChannelLayout.h | 2 +- libs/appleutility/CAAudioUnit.cpp | 16 ++++---- libs/appleutility/CAReferenceCounted.h | 6 +-- libs/ardour/ardour/audio_unit.h | 5 ++- libs/ardour/ardour/audiosource.h | 2 +- libs/ardour/ardour/caimportable.h | 6 +-- libs/ardour/ardour/coreaudiosource.h | 2 +- libs/ardour/ardour/export_channel.h | 2 +- libs/ardour/ardour/lxvst_plugin.h | 8 ++-- libs/ardour/ardour/plugin.h | 3 +- libs/ardour/audio_playlist_source.cc | 2 +- libs/ardour/audio_port.cc | 2 +- libs/ardour/audio_unit.cc | 40 +++++++++++-------- libs/ardour/export_channel.cc | 4 +- libs/ardour/file_source.cc | 2 +- libs/ardour/ladspa_plugin.cc | 2 +- libs/ardour/lxvst_plugin.cc | 6 +-- libs/ardour/midi_diskstream.cc | 1 + libs/ardour/midi_playlist_source.cc | 12 +++--- libs/ardour/midi_port.cc | 2 +- libs/ardour/midi_stretch.cc | 2 +- libs/ardour/pannable.cc | 2 +- libs/ardour/playlist_source.cc | 4 +- libs/ardour/plugin.cc | 4 +- libs/ardour/plugin_manager.cc | 2 +- libs/ardour/port.cc | 4 +- libs/ardour/processor.cc | 1 + libs/ardour/session.cc | 2 +- libs/ardour/session_process.cc | 2 +- libs/ardour/speakers.cc | 1 + libs/ardour/vstfxinfofile.cc | 6 +-- libs/audiographer/audiographer/debuggable.h | 1 + .../audiographer/process_context.h | 2 +- libs/evoral/evoral/PatchChange.hpp | 4 +- libs/evoral/src/ControlSet.cpp | 2 +- libs/evoral/src/Sequence.cpp | 2 +- libs/evoral/src/libsmf/smf_load.c | 9 +++-- libs/evoral/src/libsmf/smf_save.c | 1 + .../libgnomecanvas/gnome-canvas-bpath.c | 2 +- .../libgnomecanvas/gnome-canvas-line.c | 2 +- .../libgnomecanvas/gnome-canvas-rich-text.c | 24 +++++------ .../libgnomecanvas/gnome-canvas-widget.c | 10 ++--- .../gnomecanvas/libgnomecanvas/gnome-canvas.c | 4 +- libs/gtkmm2ext/bindings.cc | 12 +++--- libs/gtkmm2ext/cairocell.cc | 4 +- libs/gtkmm2ext/gtkapplication_quartz.mm | 15 ++++--- libs/gtkmm2ext/gtkapplication_x11.c | 5 +-- .../gtkmm2ext/cell_renderer_pixbuf_multi.h | 7 ---- .../gtkmm2ext/cell_renderer_pixbuf_toggle.h | 7 ---- libs/gtkmm2ext/gtkmm2ext/dndvbox.h | 6 +-- libs/gtkmm2ext/keyboard.cc | 2 +- libs/gtkmm2ext/motionfeedback.cc | 6 +-- libs/gtkmm2ext/treeutils.cc | 4 +- libs/midi++2/midi++/names.h | 5 ++- libs/panners/vbap/vbap.cc | 8 ++-- libs/pbd/boost_debug.cc | 16 ++++---- libs/qm-dsp/dsp/onsets/DetectionFunction.cpp | 4 +- libs/qm-dsp/dsp/onsets/PeakPicking.cpp | 5 +-- .../dsp/signalconditioning/DFProcess.cpp | 2 +- libs/qm-dsp/dsp/wavelet/Wavelet.cpp | 2 +- libs/qm-dsp/maths/CosineDistance.cpp | 2 +- libs/qm-dsp/maths/MathUtilities.cpp | 11 +++-- libs/qm-dsp/maths/Polyfit.h | 9 +++-- libs/rubberband/src/StretcherProcess.cpp | 2 + .../surfaces/generic_midi/midicontrollable.cc | 1 - libs/surfaces/osc/osc.cc | 2 +- libs/surfaces/osc/osc.h | 6 +-- libs/taglib/taglib/fileref.h | 1 + libs/taglib/taglib/mpeg/id3v1/id3v1tag.h | 1 + libs/vamp-sdk/src/vamp-sdk/PluginAdapter.cpp | 2 +- 100 files changed, 239 insertions(+), 224 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index a5dafd6757..1130177fe2 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3796,7 +3796,7 @@ ARDOUR_UI::missing_file (Session*s, std::string str, DataType type) } int -ARDOUR_UI::ambiguous_file (std::string file, std::string path, std::vector hits) +ARDOUR_UI::ambiguous_file (std::string file, std::string /*path*/, std::vector hits) { AmbiguousFileDialog dialog (file, hits); diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index b288961d71..08e0d42ab0 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -707,10 +707,14 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void step_edit_status_change (bool); + void platform_specific (); + void platform_setup (); + /* these are used only in response to a platform-specific "ShouldQuit" signal */ bool idle_finish (); void queue_finish (); + void fontconfig_dialog (); std::list _window_proxies; diff --git a/gtk2_ardour/au_pluginui.mm b/gtk2_ardour/au_pluginui.mm index 0f10af054d..256ceca7b0 100644 --- a/gtk2_ardour/au_pluginui.mm +++ b/gtk2_ardour/au_pluginui.mm @@ -131,7 +131,7 @@ AUPluginUI::AUPluginUI (boost::shared_ptr insert) smaller_hbox->set_spacing (6); smaller_hbox->pack_start (preset_label, false, false, 4); - smaller_hbox->pack_start (preset_combo, false, false); + smaller_hbox->pack_start (_preset_combo, false, false); smaller_hbox->pack_start (save_button, false, false); #if 0 /* one day these might be useful with an AU plugin, but not yet */ @@ -158,7 +158,7 @@ AUPluginUI::AUPluginUI (boost::shared_ptr insert) pack_start (low_box, false, false); preset_label.show (); - preset_combo.show (); + _preset_combo.show (); automation_mode_label.show (); automation_mode_selector.show (); bypass_button.show (); @@ -276,7 +276,7 @@ AUPluginUI::create_cocoa_view () UInt32 dataSize; Boolean isWritable; NSString* factoryClassName = 0; - NSURL* CocoaViewBundlePath; + NSURL* CocoaViewBundlePath = NULL; OSStatus result = AudioUnitGetPropertyInfo (*au->get_au(), kAudioUnitProperty_CocoaUI, diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 3adb17ab84..aff72fbf6e 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -1006,7 +1006,7 @@ AudioClock::button_press (GdkEventButton *ev, CairoCell* cell) } bool -AudioClock::button_release (GdkEventButton *ev, CairoCell* cell) +AudioClock::button_release (GdkEventButton *ev, CairoCell*) { if (editable) { if (dragging) { diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index b0767604c9..e06e50f113 100644 --- a/gtk2_ardour/audio_region_editor.cc +++ b/gtk2_ardour/audio_region_editor.cc @@ -96,10 +96,9 @@ AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr AudioRegionEditor::~AudioRegionEditor () { - pthread_cancel_one (_peak_amplitude_thread_handle); void* v; - int const r = pthread_join (_peak_amplitude_thread_handle, &v); - assert (r == 0); + pthread_cancel_one (_peak_amplitude_thread_handle); + pthread_join (_peak_amplitude_thread_handle, &v); } void diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index e4daf6e74c..4ba09120ad 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -955,7 +955,7 @@ AutomationTimeAxisView::set_state_2X (const XMLNode& node, int /*version*/) } int -AutomationTimeAxisView::set_state (const XMLNode& node, int /*version*/) +AutomationTimeAxisView::set_state (const XMLNode&, int /*version*/) { return 0; } diff --git a/gtk2_ardour/canvas-simpleline.c b/gtk2_ardour/canvas-simpleline.c index 887f71b411..39a1901f57 100644 --- a/gtk2_ardour/canvas-simpleline.c +++ b/gtk2_ardour/canvas-simpleline.c @@ -389,7 +389,7 @@ gnome_canvas_simpleline_render (GnomeCanvasItem *item, } static void -gnome_canvas_simpleline_draw (GnomeCanvasItem *item, +gnome_canvas_simpleline_draw (GnomeCanvasItem *canvas, GdkDrawable *drawable, int x, int y, int width, int height) @@ -414,7 +414,6 @@ gnome_canvas_simpleline_point (GnomeCanvasItem *item, double x, double y, int cx (void) cx; (void) cy; - GnomeCanvasSimpleLine *simpleline; double x1, y1, x2, y2; double dx, dy; diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 1677baa001..da928a6d9e 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -890,7 +890,7 @@ Editor::set_canvas_cursor (Gdk::Cursor* cursor, bool save) } bool -Editor::track_canvas_key_press (GdkEventKey* event) +Editor::track_canvas_key_press (GdkEventKey*) { /* XXX: event does not report the modifier key pressed down, AFAICS, so use the Keyboard object instead */ if (mouse_mode == Editing::MouseZoom && Keyboard::the_keyboard().key_is_down (GDK_Control_L)) { @@ -901,7 +901,7 @@ Editor::track_canvas_key_press (GdkEventKey* event) } bool -Editor::track_canvas_key_release (GdkEventKey* event) +Editor::track_canvas_key_release (GdkEventKey*) { if (mouse_mode == Editing::MouseZoom && !Keyboard::the_keyboard().key_is_down (GDK_Control_L)) { set_canvas_cursor (_cursors->zoom_in, true); diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 014c925f7d..07ae84031f 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -1084,7 +1084,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr const & /*c*/, } bool -Editor::key_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType type) +Editor::key_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType) { return false; } diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 34e7750963..04dedf97ad 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -2736,7 +2736,7 @@ MarkerDrag::aborted (bool) } void -MarkerDrag::update_item (Location* location) +MarkerDrag::update_item (Location*) { /* noop */ } diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 9df6de3a8e..21f2214a7c 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1806,7 +1806,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ } bool -Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type) +Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) { AutomationLine* al; ControlPoint* cp; @@ -2417,7 +2417,7 @@ Editor::track_height_step_timeout () } void -Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view) +Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view) { assert (region_view); @@ -2439,7 +2439,7 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* } void -Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view) +Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view) { assert (region_view); @@ -2454,7 +2454,7 @@ Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionV } void -Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view) +Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view) { assert (region_view); @@ -2584,7 +2584,7 @@ Editor::set_internal_edit (bool yn) * used by the `join object/range' tool mode. */ void -Editor::update_join_object_range_location (double x, double y) +Editor::update_join_object_range_location (double /*x*/, double y) { /* XXX: actually, this decides based on whether the mouse is in the top or bottom half of a RouteTimeAxisView; entered_{track,regionview} is not always setup (e.g. if the mouse is over a TimeSelection), and to get a Region diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index b19dd6af77..554fffa69c 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -5006,7 +5006,7 @@ void Editor::toggle_region_fades (int dir) { boost::shared_ptr ar; - bool yn; + bool yn = false; RegionSelection rs = get_regions_from_selection_and_entered (); diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index 154af6c977..c6c8f1e914 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -214,7 +214,7 @@ EditorRegions::focus_out (GdkEventFocus*) } bool -EditorRegions::enter_notify (GdkEventCrossing* ev) +EditorRegions::enter_notify (GdkEventCrossing*) { if (name_editable) { return true; @@ -743,7 +743,7 @@ EditorRegions::populate_row (boost::shared_ptr region, TreeModel::Row co #endif void -EditorRegions::populate_row_used (boost::shared_ptr region, TreeModel::Row const& row, uint32_t used) +EditorRegions::populate_row_used (boost::shared_ptr, TreeModel::Row const& row, uint32_t used) { char buf[8]; snprintf (buf, sizeof (buf), "%4d" , used); diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 1c077e8552..b7a3f2ba5f 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -1746,7 +1746,7 @@ Editor::set_samples_ruler_scale (framepos_t lower, framepos_t upper) } gint -Editor::metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/) +Editor::metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/) { framepos_t pos; framepos_t const ilower = (framepos_t) floor (lower); diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index c2338347d2..b108659981 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -1230,7 +1230,7 @@ Editor::select_all_in_track (Selection::Operation op) } void -Editor::select_all_internal_edit (Selection::Operation op) +Editor::select_all_internal_edit (Selection::Operation) { /* currently limited to MIDI only */ diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 471239efdc..79f5d4b421 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -634,7 +634,7 @@ GainMeterBase::gain_slider_button_press (GdkEventButton* ev) } bool -GainMeterBase::gain_slider_button_release (GdkEventButton* ev) +GainMeterBase::gain_slider_button_release (GdkEventButton*) { _amp->gain_control()->stop_touch (false, _amp->session().transport_frame()); return true; diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index e2f8e9905a..5c713f1352 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -603,7 +603,7 @@ GroupTabs::route_group_property_changed (RouteGroup* rg) } void -GroupTabs::route_added_to_route_group (RouteGroup* rg, boost::weak_ptr w) +GroupTabs::route_added_to_route_group (RouteGroup*, boost::weak_ptr w) { /* Similarly-spirited hack as in route_group_property_changed */ @@ -616,7 +616,7 @@ GroupTabs::route_added_to_route_group (RouteGroup* rg, boost::weak_ptr w) } void -GroupTabs::route_removed_from_route_group (RouteGroup* rg, boost::weak_ptr w) +GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr w) { /* Similarly-spirited hack as in route_group_property_changed */ diff --git a/gtk2_ardour/gtk_pianokeyboard.c b/gtk2_ardour/gtk_pianokeyboard.c index 90405a6c31..7332299bfb 100644 --- a/gtk2_ardour/gtk_pianokeyboard.c +++ b/gtk2_ardour/gtk_pianokeyboard.c @@ -352,7 +352,7 @@ bind_keys_azerty(PianoKeyboard *pk) } static gint -keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer notused) +keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer ignored) { int note; char *key; @@ -433,7 +433,7 @@ get_note_for_xy(PianoKeyboard *pk, int x, int y) } static gboolean -mouse_button_event_handler(PianoKeyboard *pk, GdkEventButton *event, gpointer notused) +mouse_button_event_handler(PianoKeyboard *pk, GdkEventButton *event, gpointer ignored) { int x = event->x; int y = event->y; @@ -473,7 +473,7 @@ mouse_button_event_handler(PianoKeyboard *pk, GdkEventButton *event, gpointer no } static gboolean -mouse_motion_event_handler(PianoKeyboard *pk, GdkEventMotion *event, gpointer notused) +mouse_motion_event_handler(PianoKeyboard *pk, GdkEventMotion *event, gpointer ignored) { int note; diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index c0f5d1f325..004bf9e765 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -593,7 +593,7 @@ LocationEditRow::preemph_toggled () } void -LocationEditRow::end_changed (ARDOUR::Location *loc) +LocationEditRow::end_changed (ARDOUR::Location *) { ENSURE_GUI_THREAD (*this, &LocationEditRow::end_changed, loc) diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 69f6b87442..b79d97d746 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -388,7 +388,7 @@ MidiRegionView::enter_notify (GdkEventCrossing* ev) } bool -MidiRegionView::leave_notify (GdkEventCrossing* ev) +MidiRegionView::leave_notify (GdkEventCrossing*) { _mouse_mode_connection.disconnect (); @@ -850,7 +850,7 @@ void MidiRegionView::channel_edit () { bool first = true; - uint8_t current_channel; + uint8_t current_channel = 0; if (_selection.empty()) { return; diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 7012ad61f5..15550f4cd4 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1880,7 +1880,7 @@ MixerStrip::hide_things () } bool -MixerStrip::input_active_button_press (GdkEventButton* ev) +MixerStrip::input_active_button_press (GdkEventButton*) { /* nothing happens on press */ return true; diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index de6685fade..1bdd27dc6d 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -762,7 +762,7 @@ MonitorSection::setup_knob_images () void MonitorSection::update_solo_model () { - const char* action_name; + const char* action_name = 0; Glib::RefPtr act; if (Config->get_solo_control_is_listen_control()) { diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index 78fec4e679..43afcd5c84 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -121,7 +121,7 @@ MonoPanner::value_change () } bool -MonoPanner::on_expose_event (GdkEventExpose* ev) +MonoPanner::on_expose_event (GdkEventExpose*) { Glib::RefPtr win (get_window()); Glib::RefPtr gc (get_style()->get_base_gc (get_state())); @@ -469,13 +469,13 @@ MonoPanner::on_key_press_event (GdkEventKey* ev) } bool -MonoPanner::on_key_release_event (GdkEventKey* ev) +MonoPanner::on_key_release_event (GdkEventKey*) { return false; } bool -MonoPanner::on_enter_notify_event (GdkEventCrossing* ev) +MonoPanner::on_enter_notify_event (GdkEventCrossing*) { grab_focus (); Keyboard::magic_widget_grab_focus (); diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index d61471d19e..ffe9a15954 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -853,7 +853,7 @@ Panner2dWindow::on_key_press_event (GdkEventKey* event) } bool -Panner2dWindow::on_key_release_event (GdkEventKey *event) +Panner2dWindow::on_key_release_event (GdkEventKey*) { return true; } diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 534c7ef0d6..f213bb89ea 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -224,7 +224,7 @@ RegionView::~RegionView () } void -RegionView::set_silent_frames (const AudioIntervalResult& silences, double threshold) +RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*threshold*/) { framecnt_t shortest = max_framecnt; diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 81b50f04b6..17c0874641 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -1875,7 +1875,7 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr } void -RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, boost::shared_ptr i) +RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, boost::shared_ptr) { if (!_hidden) { pan->menu_item->set_active (false); @@ -2281,7 +2281,7 @@ RouteTimeAxisView::set_underlay_state() } void -RouteTimeAxisView::add_underlay (StreamView* v, bool update_xml) +RouteTimeAxisView::add_underlay (StreamView* v, bool /*update_xml*/) { if (!v) { return; diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc index dd7cd753e6..a496ddc0b2 100644 --- a/gtk2_ardour/shuttle_control.cc +++ b/gtk2_ardour/shuttle_control.cc @@ -483,7 +483,7 @@ ShuttleControl::use_shuttle_fract (bool force) } bool -ShuttleControl::on_expose_event (GdkEventExpose* event) +ShuttleControl::on_expose_event (GdkEventExpose*) { cairo_text_extents_t extents; Glib::RefPtr win (get_window()); diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index 7fe204fbfd..690acbfdda 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -619,13 +619,13 @@ StereoPanner::on_key_press_event (GdkEventKey* ev) } bool -StereoPanner::on_key_release_event (GdkEventKey* ev) +StereoPanner::on_key_release_event (GdkEventKey*) { return false; } bool -StereoPanner::on_enter_notify_event (GdkEventCrossing* ev) +StereoPanner::on_enter_notify_event (GdkEventCrossing*) { grab_focus (); Keyboard::magic_widget_grab_focus (); diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 14cbecd808..4ed057add9 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -397,7 +397,7 @@ TimeAxisView::controls_ebox_motion (GdkEventMotion* ev) } bool -TimeAxisView::controls_ebox_leave (GdkEventCrossing* ev) +TimeAxisView::controls_ebox_leave (GdkEventCrossing*) { if (_have_preresize_cursor) { gdk_window_set_cursor (controls_ebox.get_window()->gobj(), _preresize_cursor); diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index ce2e6c1485..d9b0bfa2cf 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -109,7 +109,7 @@ TimeAxisViewItem::TimeAxisViewItem( } TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) - : sigc::trackable(other) + : Selectable (other) , PBD::ScopedConnectionList() , trackview (other.trackview) , _recregion (other._recregion) diff --git a/libs/appleutility/CAAudioChannelLayout.h b/libs/appleutility/CAAudioChannelLayout.h index 796f197c3b..5c351c29b5 100644 --- a/libs/appleutility/CAAudioChannelLayout.h +++ b/libs/appleutility/CAAudioChannelLayout.h @@ -150,7 +150,7 @@ private: private: ACLRefCounter () : mLayout(NULL) { } - ACLRefCounter(const ACLRefCounter&) : mLayout(NULL) { } + ACLRefCounter(const ACLRefCounter& other) : CAReferenceCounted (other), mLayout(NULL) { } ACLRefCounter& operator=(const ACLRefCounter&) { return *this; } }; diff --git a/libs/appleutility/CAAudioUnit.cpp b/libs/appleutility/CAAudioUnit.cpp index aaf57f233d..131969b66c 100644 --- a/libs/appleutility/CAAudioUnit.cpp +++ b/libs/appleutility/CAAudioUnit.cpp @@ -191,7 +191,7 @@ private: private: // get the compiler to tell us when we do a bad thing!!! AUState () {} - AUState (const AUState&) {} + AUState (const AUState& other) : CAReferenceCounted (other) {} AUState& operator= (const AUState&) { return *this; } }; @@ -1084,13 +1084,13 @@ bool CAAudioUnit::HasCustomView () const OSStatus CAAudioUnit::GetParameter(AudioUnitParameterID inID, AudioUnitScope scope, AudioUnitElement element, Float32 &outValue) const { - return mDataPtr ? mDataPtr->GetParameter (inID, scope, element, outValue) : paramErr; + return mDataPtr ? (OSStatus) mDataPtr->GetParameter (inID, scope, element, outValue) : paramErr; } OSStatus CAAudioUnit::SetParameter(AudioUnitParameterID inID, AudioUnitScope scope, AudioUnitElement element, Float32 value, UInt32 bufferOffsetFrames) { - return mDataPtr ? mDataPtr->SetParameter (inID, scope, element, value, bufferOffsetFrames) : paramErr; + return mDataPtr ? (OSStatus) mDataPtr->SetParameter (inID, scope, element, value, bufferOffsetFrames) : paramErr; } OSStatus CAAudioUnit::MIDIEvent (UInt32 inStatus, @@ -1098,7 +1098,7 @@ OSStatus CAAudioUnit::MIDIEvent (UInt32 inStatus, UInt32 inData2, UInt32 inOffsetSampleFrame) { - return mDataPtr ? mDataPtr->MIDIEvent (inStatus, inData1, inData2, inOffsetSampleFrame) : paramErr; + return mDataPtr ? (OSStatus) mDataPtr->MIDIEvent (inStatus, inData1, inData2, inOffsetSampleFrame) : paramErr; } OSStatus CAAudioUnit::StartNote (MusicDeviceInstrumentID inInstrument, @@ -1107,15 +1107,15 @@ OSStatus CAAudioUnit::StartNote (MusicDeviceInstrumentID inInstrument, UInt32 inOffsetSampleFrame, const MusicDeviceNoteParams * inParams) { - return mDataPtr ? mDataPtr->StartNote (inInstrument, inGroupID, outNoteInstanceID, inOffsetSampleFrame, inParams) - : paramErr; + return mDataPtr ? (OSStatus) mDataPtr->StartNote (inInstrument, inGroupID, outNoteInstanceID, inOffsetSampleFrame, inParams) + : paramErr; } OSStatus CAAudioUnit::StopNote (MusicDeviceGroupID inGroupID, NoteInstanceID inNoteInstanceID, UInt32 inOffsetSampleFrame) { - return mDataPtr ? mDataPtr->StopNote (inGroupID, inNoteInstanceID, inOffsetSampleFrame) : paramErr; + return mDataPtr ? (OSStatus) mDataPtr->StopNote (inGroupID, inNoteInstanceID, inOffsetSampleFrame) : paramErr; } #pragma mark __Render @@ -1126,7 +1126,7 @@ OSStatus CAAudioUnit::Render (AudioUnitRenderActionFlags * ioActionFlags, UInt32 inNumberFrames, AudioBufferList * ioData) { - return mDataPtr ? mDataPtr->Render (ioActionFlags, inTimeStamp, inOutputBusNumber, inNumberFrames, ioData) : paramErr; + return mDataPtr ? (OSStatus) mDataPtr->Render (ioActionFlags, inTimeStamp, inOutputBusNumber, inNumberFrames, ioData) : paramErr; } static AURenderCallbackStruct sRenderCallback; diff --git a/libs/appleutility/CAReferenceCounted.h b/libs/appleutility/CAReferenceCounted.h index fc18dc8ca4..a9c8dccca3 100644 --- a/libs/appleutility/CAReferenceCounted.h +++ b/libs/appleutility/CAReferenceCounted.h @@ -70,12 +70,12 @@ public: } protected: - virtual ~CAReferenceCounted() { } - + virtual ~CAReferenceCounted() { } + CAReferenceCounted(const CAReferenceCounted &) : mRefCount(0) { } + private: SInt32 mRefCount; - CAReferenceCounted(const CAReferenceCounted &) : mRefCount(0) { } CAReferenceCounted operator=(const CAReferenceCounted &) { return *this; } }; diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h index f36e89073b..0a786d5462 100644 --- a/libs/ardour/ardour/audio_unit.h +++ b/libs/ardour/ardour/audio_unit.h @@ -97,7 +97,6 @@ class AUPlugin : public ARDOUR::Plugin int set_state(const XMLNode& node, int); - PresetRecord save_preset (std::string name); bool load_preset (PresetRecord); std::string current_preset() const; @@ -140,6 +139,10 @@ class AUPlugin : public ARDOUR::Plugin static std::string maybe_fix_broken_au_id (const std::string&); + protected: + std::string do_save_preset (std::string name); + void do_remove_preset (std::string); + private: void find_presets (); diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h index 67d5ddce3a..c9eb3bfc45 100644 --- a/libs/ardour/ardour/audiosource.h +++ b/libs/ardour/ardour/audiosource.h @@ -145,7 +145,7 @@ class AudioSource : virtual public Source, virtual framecnt_t read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const = 0; virtual framecnt_t write_unlocked (Sample *dst, framecnt_t cnt) = 0; virtual std::string peak_path(std::string audio_path) = 0; - virtual std::string find_broken_peakfile (std::string missing_peak_path, + virtual std::string find_broken_peakfile (std::string /* missing_peak_path */, std::string audio_path) { return peak_path (audio_path); } virtual int read_peaks_with_fpp (PeakData *peaks, diff --git a/libs/ardour/ardour/caimportable.h b/libs/ardour/ardour/caimportable.h index 2e86ff2c90..1ed8676ee6 100644 --- a/libs/ardour/ardour/caimportable.h +++ b/libs/ardour/ardour/caimportable.h @@ -33,11 +33,11 @@ class CAImportableSource : public ImportableSource { CAImportableSource (const std::string& path); virtual ~CAImportableSource(); - nframes_t read (Sample* buffer, nframes_t nframes); + framecnt_t read (Sample* buffer, framecnt_t nframes); uint32_t channels() const; framecnt_t length() const; - nframes_t samplerate() const; - void seek (nframes_t pos); + framecnt_t samplerate() const; + void seek (framepos_t pos); framepos_t natural_position() const { return 0; } bool clamped_at_unity () const { return false; } diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h index 2f283dfd36..820fa0b9d8 100644 --- a/libs/ardour/ardour/coreaudiosource.h +++ b/libs/ardour/ardour/coreaudiosource.h @@ -54,7 +54,7 @@ class CoreAudioSource : public AudioFileSource { uint16_t n_channels; void init_cafile (); - int safe_read (Sample*, nframes_t start, framecnt_t cnt, AudioBufferList&) const; + int safe_read (Sample*, framepos_t start, framecnt_t cnt, AudioBufferList&) const; }; }; /* namespace ARDOUR */ diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h index 1a71f14c3c..a73d04aa36 100644 --- a/libs/ardour/ardour/export_channel.h +++ b/libs/ardour/ardour/export_channel.h @@ -47,7 +47,7 @@ class ExportChannel : public boost::less_than_comparable virtual ~ExportChannel () {} - virtual void set_max_buffer_size(framecnt_t frames) { } + virtual void set_max_buffer_size(framecnt_t) { } virtual void read (Sample const *& data, framecnt_t frames) const = 0; virtual bool empty () const = 0; diff --git a/libs/ardour/ardour/lxvst_plugin.h b/libs/ardour/ardour/lxvst_plugin.h index 24793772ef..108437b6a3 100755 --- a/libs/ardour/ardour/lxvst_plugin.h +++ b/libs/ardour/ardour/lxvst_plugin.h @@ -73,10 +73,10 @@ class LXVSTPlugin : public ARDOUR::Plugin std::string state_node_name() const { return "lxvst"; } void print_parameter (uint32_t, char*, uint32_t len) const; - bool parameter_is_audio(uint32_t i) const { return false; } - bool parameter_is_control(uint32_t i) const { return true; } - bool parameter_is_input(uint32_t i) const { return true; } - bool parameter_is_output(uint32_t i) const { return false; } + bool parameter_is_audio(uint32_t) const { return false; } + bool parameter_is_control(uint32_t) const { return true; } + bool parameter_is_input(uint32_t) const { return true; } + bool parameter_is_output(uint32_t) const { return false; } bool load_preset (PresetRecord); int first_user_preset_index () const; diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h index 2c819e96f2..fcd7d6d19b 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -136,8 +136,7 @@ class Plugin : public PBD::StatefulDestructible, public Latent typedef std::map ScalePoints; - virtual boost::shared_ptr - get_scale_points(uint32_t port_index) const { + virtual boost::shared_ptr get_scale_points(uint32_t /*port_index*/) const { return boost::shared_ptr(); } diff --git a/libs/ardour/audio_playlist_source.cc b/libs/ardour/audio_playlist_source.cc index 79c0c12691..141a8495f9 100644 --- a/libs/ardour/audio_playlist_source.cc +++ b/libs/ardour/audio_playlist_source.cc @@ -171,7 +171,7 @@ AudioPlaylistSource::read_unlocked (Sample* dst, framepos_t start, framecnt_t cn } framecnt_t -AudioPlaylistSource::write_unlocked (Sample *src, framecnt_t cnt) +AudioPlaylistSource::write_unlocked (Sample *, framecnt_t) { fatal << string_compose (_("programming error: %1"), "AudioPlaylistSource::write() called - should be impossible") << endmsg; /*NOTREACHED*/ diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc index 556f6e0c2a..ae64d797c9 100644 --- a/libs/ardour/audio_port.cc +++ b/libs/ardour/audio_port.cc @@ -53,7 +53,7 @@ AudioPort::cycle_start (pframes_t nframes) } void -AudioPort::cycle_end (pframes_t nframes) +AudioPort::cycle_end (pframes_t) { if (sends_output() && !_buffer->written()) { /* we can't use nframes here because the current buffer capacity may diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index a4d2dd241e..04efb2e50c 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -1341,7 +1341,7 @@ AUPlugin::get_beat_and_tempo_callback (Float64* outCurrentBeat, float beat; beat = metric.meter().beats_per_bar() * bbt.bars; beat += bbt.beats; - beat += bbt.ticks / BBT_Time::ticks_per_beat; + beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; *outCurrentBeat = beat; } @@ -1381,8 +1381,9 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe /* on the beat */ *outDeltaSampleOffsetToNextBeat = 0; } else { - *outDeltaSampleOffsetToNextBeat = (UInt32) floor (((BBT_Time::ticks_per_beat - bbt.ticks)/BBT_Time::ticks_per_beat) * // fraction of a beat to next beat - metric.tempo().frames_per_beat(_session.frame_rate(), metric.meter())); // frames per beat + *outDeltaSampleOffsetToNextBeat = (UInt32) + floor (((Timecode::BBT_Time::ticks_per_beat - bbt.ticks)/Timecode::BBT_Time::ticks_per_beat) * // fraction of a beat to next beat + metric.tempo().frames_per_beat(_session.frame_rate(), metric.meter())); // frames per beat } } @@ -1473,7 +1474,7 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying, float beat; beat = metric.meter().beats_per_bar() * bbt.bars; beat += bbt.beats; - beat += bbt.ticks / BBT_Time::ticks_per_beat; + beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; *outCycleStartBeat = beat; } @@ -1485,7 +1486,7 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying, float beat; beat = metric.meter().beats_per_bar() * bbt.bars; beat += bbt.beats; - beat += bbt.ticks / BBT_Time::ticks_per_beat; + beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat; *outCycleEndBeat = beat; } @@ -1554,7 +1555,7 @@ AUPlugin::parameter_is_output (uint32_t) const } void -AUPlugin::add_state (XMLNode* root) +AUPlugin::add_state (XMLNode* root) const { LocaleGuard lg (X_("POSIX")); @@ -1573,7 +1574,7 @@ AUPlugin::add_state (XMLNode* root) if (!xmlData) { error << _("Could not create XML version of property list") << endmsg; - return *root; + return; } /* re-parse XML bytes to create a libxml++ XMLTree that we can merge into @@ -1662,7 +1663,7 @@ AUPlugin::set_state(const XMLNode& node, int version) } bool -AUPlugin::load_preset (PluginRecord r) +AUPlugin::load_preset (PresetRecord r) { Plugin::load_preset (r); @@ -1675,7 +1676,7 @@ AUPlugin::load_preset (PluginRecord r) /* look first in "user" presets */ - if ((ux = user_preset_map.find (preset_label)) != user_preset_map.end()) { + if ((ux = user_preset_map.find (r.label)) != user_preset_map.end()) { if ((propertyList = load_property_list (ux->second)) != 0) { TRACE_API ("set preset from user presets\n"); @@ -1692,7 +1693,7 @@ AUPlugin::load_preset (PluginRecord r) CFRelease(propertyList); } - } else if ((fx = factory_preset_map.find (preset_label)) != factory_preset_map.end()) { + } else if ((fx = factory_preset_map.find (r.label)) != factory_preset_map.end()) { AUPreset preset; @@ -1725,8 +1726,13 @@ AUPlugin::load_preset (PluginRecord r) #endif } -PresetRecord -AUPlugin::save_preset (string preset_name) +void +AUPlugin::do_remove_preset (std::string) +{ +} + +string +AUPlugin::do_save_preset (string preset_name) { #ifdef AU_STATE_SUPPORT CFPropertyListRef propertyList; @@ -1776,7 +1782,7 @@ AUPlugin::save_preset (string preset_name) CFRelease(propertyList); - return ret; + return string ("file:///") + user_preset_path; #else if (!seen_saving_message) { info << string_compose (_("Saving AudioUnit presets is not supported in this build of %1. Consider paying for a newer version"), @@ -1784,7 +1790,7 @@ AUPlugin::save_preset (string preset_name) << endmsg; seen_saving_message = true; } - return false; + return string(); #endif } @@ -2006,7 +2012,7 @@ AUPlugin::find_presets () /* now fill the vector with the names we have */ for (UserPresetMap::iterator i = user_preset_map.begin(); i != user_preset_map.end(); ++i) { - _presets.insert (i->second, Plugin::PresetRecord (i->second, i->first)); + _presets.insert (make_pair (i->second, Plugin::PresetRecord (i->second, i->first))); } /* add factory presets */ @@ -2014,7 +2020,7 @@ AUPlugin::find_presets () for (FactoryPresetMap::iterator i = factory_preset_map.begin(); i != factory_preset_map.end(); ++i) { /* XXX: dubious */ string const uri = string_compose ("%1", _presets.size ()); - _presets.push_back (uri, Plugin::PresetRecord (uri, i->first)); + _presets.insert (make_pair (uri, Plugin::PresetRecord (uri, i->first))); } #endif @@ -2082,10 +2088,12 @@ AUPluginInfo::discover () PluginInfoList* plugs = new PluginInfoList; +#if 0 discover_fx (*plugs); discover_music (*plugs); discover_generators (*plugs); discover_instruments (*plugs); +#endif return plugs; } diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc index 785648393e..4593c4de9f 100644 --- a/libs/ardour/export_channel.cc +++ b/libs/ardour/export_channel.cc @@ -241,13 +241,13 @@ RouteExportChannel::read (Sample const *& data, framecnt_t frames) const } void -RouteExportChannel::get_state (XMLNode * node) const +RouteExportChannel::get_state (XMLNode *) const { // TODO } void -RouteExportChannel::set_state (XMLNode * node, Session & session) +RouteExportChannel::set_state (XMLNode *, Session &) { // TODO } diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc index 877a0a4939..e35ee81364 100644 --- a/libs/ardour/file_source.cc +++ b/libs/ardour/file_source.cc @@ -235,7 +235,7 @@ FileSource::move_to_trash (const string& trash_dir_name) */ bool FileSource::find (Session& s, DataType type, const string& path, bool must_exist, - bool& isnew, uint16_t& chan, string& found_path) + bool& isnew, uint16_t& /* chan */, string& found_path) { bool ret = false; string keeppath; diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc index 1fc8b2f1a0..ef1a6b6682 100644 --- a/libs/ardour/ladspa_plugin.cc +++ b/libs/ardour/ladspa_plugin.cc @@ -761,7 +761,7 @@ LadspaPlugin::load_preset (PresetRecord r) /* XXX: should be in liblrdf */ static void -lrdf_remove_preset (const char *source, const char *setting_uri) +lrdf_remove_preset (const char* /*source*/, const char *setting_uri) { lrdf_statement p; lrdf_statement *q; diff --git a/libs/ardour/lxvst_plugin.cc b/libs/ardour/lxvst_plugin.cc index 737d1c7360..d42679742b 100755 --- a/libs/ardour/lxvst_plugin.cc +++ b/libs/ardour/lxvst_plugin.cc @@ -125,7 +125,7 @@ LXVSTPlugin::set_block_size (pframes_t nframes) } float -LXVSTPlugin::default_value (uint32_t port) +LXVSTPlugin::default_value (uint32_t) { return 0; } @@ -346,7 +346,7 @@ LXVSTPlugin::load_plugin_preset (PresetRecord r) int index; int const p = sscanf (r.uri.c_str(), "VST:%d:%d", &id, &index); assert (p == 2); - + _vstfx->want_program = index; return true; } @@ -653,7 +653,7 @@ LXVSTPlugin::has_editor () const } void -LXVSTPlugin::print_parameter (uint32_t param, char *buf, uint32_t len) const +LXVSTPlugin::print_parameter (uint32_t param, char *buf, uint32_t /*len*/) const { char *first_nonws; diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index bf5be343e2..28ee12cc5a 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -291,6 +291,7 @@ MidiDiskstream::use_copy_playlist () int MidiDiskstream::set_destructive (bool yn) { + yn = 0; // stop pedantic gcc complaints about unused parameter assert( ! destructive()); assert( ! yn); return -1; diff --git a/libs/ardour/midi_playlist_source.cc b/libs/ardour/midi_playlist_source.cc index 3b2c8dbb48..6270ad4339 100644 --- a/libs/ardour/midi_playlist_source.cc +++ b/libs/ardour/midi_playlist_source.cc @@ -58,7 +58,7 @@ on other ways to approach this issue. ********************************************************************************/ MidiPlaylistSource::MidiPlaylistSource (Session& s, const ID& orig, const std::string& name, boost::shared_ptr p, - uint32_t chn, frameoffset_t begin, framecnt_t len, Source::Flag flags) + uint32_t /*chn*/, frameoffset_t begin, framecnt_t len, Source::Flag flags) : Source (s, DataType::MIDI, name) , MidiSource (s, name, flags) , PlaylistSource (s, orig, name, p, DataType::MIDI, begin, len, flags) @@ -128,9 +128,9 @@ MidiPlaylistSource::length (framepos_t) const framepos_t MidiPlaylistSource::read_unlocked (Evoral::EventSink& dst, - framepos_t position, + framepos_t /*position*/, framepos_t start, framecnt_t cnt, - MidiStateTracker* tracker) const + MidiStateTracker*) const { boost::shared_ptr mp = boost::dynamic_pointer_cast (_playlist); @@ -143,8 +143,8 @@ MidiPlaylistSource::read_unlocked (Evoral::EventSink& dst, framepos_t MidiPlaylistSource::write_unlocked (MidiRingBuffer& dst, - framepos_t position, - framecnt_t cnt) + framepos_t, + framecnt_t) { fatal << string_compose (_("programming error: %1"), "MidiPlaylistSource::write_unlocked() called - should be impossible") << endmsg; /*NOTREACHED*/ @@ -159,7 +159,7 @@ MidiPlaylistSource::append_event_unlocked_beats(const Evoral::Event& ev, framepos_t source_start) +MidiPlaylistSource::append_event_unlocked_frames(const Evoral::Event& /* ev */, framepos_t /*source_start*/) { fatal << string_compose (_("programming error: %1"), "MidiPlaylistSource::append_event_unlocked_frames() called - should be impossible") << endmsg; /*NOTREACHED*/ diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc index c27332fce1..50d4ce64e8 100644 --- a/libs/ardour/midi_port.cc +++ b/libs/ardour/midi_port.cc @@ -155,7 +155,7 @@ MidiPort::resolve_notes (void* jack_buffer, MidiBuffer::TimeType when) } void -MidiPort::flush_buffers (pframes_t nframes, framepos_t time) +MidiPort::flush_buffers (pframes_t nframes, framepos_t /*time*/) { if (sends_output ()) { diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc index d9ac1403a9..2ae86a6d1c 100644 --- a/libs/ardour/midi_stretch.cc +++ b/libs/ardour/midi_stretch.cc @@ -42,7 +42,7 @@ MidiStretch::~MidiStretch () } int -MidiStretch::run (boost::shared_ptr r, Progress* progress) +MidiStretch::run (boost::shared_ptr r, Progress*) { SourceList nsrcs; char suffix[32]; diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc index ba4632f2b0..4dad58ed12 100644 --- a/libs/ardour/pannable.cc +++ b/libs/ardour/pannable.cc @@ -182,7 +182,7 @@ Pannable::get_state () } XMLNode& -Pannable::state (bool full) +Pannable::state (bool /*full*/) { XMLNode* node = new XMLNode (X_("Pannable")); diff --git a/libs/ardour/playlist_source.cc b/libs/ardour/playlist_source.cc index f68033c815..4c01831b02 100644 --- a/libs/ardour/playlist_source.cc +++ b/libs/ardour/playlist_source.cc @@ -44,7 +44,7 @@ using namespace ARDOUR; using namespace PBD; PlaylistSource::PlaylistSource (Session& s, const ID& orig, const std::string& name, boost::shared_ptr p, DataType type, - frameoffset_t begin, framecnt_t len, Source::Flag flags) + frameoffset_t begin, framecnt_t len, Source::Flag /*flags*/) : Source (s, type, name) , _playlist (p) , _original (orig) @@ -92,7 +92,7 @@ PlaylistSource::add_state (XMLNode& node) } int -PlaylistSource::set_state (const XMLNode& node, int version) +PlaylistSource::set_state (const XMLNode& node, int /*version*/) { /* check that we have a playlist ID */ diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc index 153c624a5a..12760e5d6e 100644 --- a/libs/ardour/plugin.cc +++ b/libs/ardour/plugin.cc @@ -236,7 +236,7 @@ Plugin::preset_by_uri (const string& uri) int Plugin::connect_and_run (BufferSet& bufs, - ChanMapping in_map, ChanMapping out_map, + ChanMapping /*in_map*/, ChanMapping /*out_map*/, pframes_t nframes, framecnt_t offset) { if (bufs.count().n_midi() > 0) { @@ -306,7 +306,7 @@ Plugin::set_parameter (uint32_t which, float val) } int -Plugin::set_state (const XMLNode& node, int version) +Plugin::set_state (const XMLNode& node, int /*version*/) { XMLProperty const * p = node.property (X_("last-preset-uri")); if (p) { diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index 204867a43d..613fc85c6d 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -652,7 +652,7 @@ PluginManager::add_lxvst_directory (string path) return -1; } -static bool lxvst_filter (const string& str, void *arg) +static bool lxvst_filter (const string& str, void *) { /* Not a dotfile, has a prefix before a period, suffix is "so" */ diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc index 5a7c859dbd..b418943bba 100644 --- a/libs/ardour/port.cc +++ b/libs/ardour/port.cc @@ -230,7 +230,7 @@ Port::reset () } void -Port::cycle_start (pframes_t nframes) +Port::cycle_start (pframes_t) { _port_buffer_offset = 0; } @@ -307,7 +307,7 @@ Port::private_latency_range (bool playback) const } jack_latency_range_t -Port::public_latency_range (bool playback) const +Port::public_latency_range (bool /*playback*/) const { jack_latency_range_t r; diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc index f7afeb99a7..8b54bd4f55 100644 --- a/libs/ardour/processor.cc +++ b/libs/ardour/processor.cc @@ -76,6 +76,7 @@ Processor::Processor (const Processor& other) : Evoral::ControlSet (other) , SessionObject (other.session(), other.name()) , Automatable (other.session()) + , Latent (other) , _pending_active(other._pending_active) , _active(other._active) , _next_ab_is_active(false) diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 5b1dd3894f..a42f2d4430 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -2511,7 +2511,7 @@ Session::io_name_is_legal (const std::string& name) } void -Session::set_exclusive_input_active (boost::shared_ptr rt, bool others_on) +Session::set_exclusive_input_active (boost::shared_ptr rt, bool /*others_on*/) { RouteList rl; vector connections; diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 947bceac9d..4d974d4830 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -617,7 +617,7 @@ Session::calculate_moving_average_of_slave_delta (int dir, framecnt_t this_delta } void -Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame, framecnt_t this_delta) +Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame, framecnt_t /*this_delta*/) { if (slave_speed != 0.0f) { diff --git a/libs/ardour/speakers.cc b/libs/ardour/speakers.cc index 71e524f490..51bae16585 100644 --- a/libs/ardour/speakers.cc +++ b/libs/ardour/speakers.cc @@ -71,6 +71,7 @@ Speakers::Speakers () } Speakers::Speakers (const Speakers& s) + : Stateful () { _speakers = s._speakers; } diff --git a/libs/ardour/vstfxinfofile.cc b/libs/ardour/vstfxinfofile.cc index 2d54f4d1cd..076cdad55f 100755 --- a/libs/ardour/vstfxinfofile.cc +++ b/libs/ardour/vstfxinfofile.cc @@ -297,12 +297,12 @@ static VSTFXInfo* vstfx_info_from_plugin(VSTFX *vstfx) /* A simple 'dummy' audiomaster callback which should be ok, we will only be instantiating the plugin in order to get its info*/ -static long simple_master_callback(struct AEffect *fx, long opcode, long index, long value, void *ptr, float opt) +static long simple_master_callback(struct AEffect *, long opcode, long, long, void *, float) { - if(opcode == audioMasterVersion) + if (opcode == audioMasterVersion) return 2; - else + else return 0; } diff --git a/libs/audiographer/audiographer/debuggable.h b/libs/audiographer/audiographer/debuggable.h index 5ef382890b..79e0f80dd3 100644 --- a/libs/audiographer/audiographer/debuggable.h +++ b/libs/audiographer/audiographer/debuggable.h @@ -44,6 +44,7 @@ class Debuggable bool debug_level (DebugLevel level) { #ifdef NDEBUG + level = DEFAULT_DEBUG_LEVEL; /* stop pedantic gcc complaints about unused parameter */ return false; #else return L >= level; diff --git a/libs/audiographer/audiographer/process_context.h b/libs/audiographer/audiographer/process_context.h index 843c09b618..b73f5d69d5 100644 --- a/libs/audiographer/audiographer/process_context.h +++ b/libs/audiographer/audiographer/process_context.h @@ -43,7 +43,7 @@ public: /// Normal copy constructor ProcessContext (ProcessContext const & other) - : _data (other._data), _frames (other._frames), _channels (other._channels), _flags (other._flags) + : _data (other._data), _frames (other._frames), _channels (other._channels), _flags (other._flags) { /* No need to validate data */ } /// "Copy constructor" with unique data, frame and channel count, but copies flags diff --git a/libs/evoral/evoral/PatchChange.hpp b/libs/evoral/evoral/PatchChange.hpp index 576a1d2e98..aaa481516f 100644 --- a/libs/evoral/evoral/PatchChange.hpp +++ b/libs/evoral/evoral/PatchChange.hpp @@ -146,7 +146,9 @@ public: case 2: return _program_change; default: - assert (false); + abort (); + /*NOTREACHED*/ + return _program_change; } } diff --git a/libs/evoral/src/ControlSet.cpp b/libs/evoral/src/ControlSet.cpp index 6b793a08ea..bdc73121d2 100644 --- a/libs/evoral/src/ControlSet.cpp +++ b/libs/evoral/src/ControlSet.cpp @@ -32,7 +32,7 @@ ControlSet::ControlSet() { } -ControlSet::ControlSet (const ControlSet& other) +ControlSet::ControlSet (const ControlSet&) : noncopyable () { /* derived class must copy controls */ diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index fb10bfac7b..a7d58348e2 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -1249,7 +1249,7 @@ template void Sequence