smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

fixes for 98% of all the warnings/errors reported by OS X gcc on tiger

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-09-30 17:55:14 +00:00
parent 15e390ebe5
commit 0938a42440
100 changed files with 239 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.cc
View file

@ -3796,7 +3796,7 @@ ARDOUR_UI::missing_file (Session*s, std::string str, DataType type)
} }
int int
ARDOUR_UI::ambiguous_file (std::string file, std::string path, std::vector<std::string> hits) ARDOUR_UI::ambiguous_file (std::string file, std::string /*path*/, std::vector<std::string> hits)
{ {
AmbiguousFileDialog dialog (file, hits); AmbiguousFileDialog dialog (file, hits);

4
gtk2_ardour/ardour_ui.h
View file

@ -707,10 +707,14 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void step_edit_status_change (bool); void step_edit_status_change (bool);
void platform_specific ();
void platform_setup ();
/* these are used only in response to a platform-specific "ShouldQuit" signal /* these are used only in response to a platform-specific "ShouldQuit" signal
*/ */
bool idle_finish (); bool idle_finish ();
void queue_finish (); void queue_finish ();
void fontconfig_dialog ();
std::list<WindowProxyBase*> _window_proxies; std::list<WindowProxyBase*> _window_proxies;

6
gtk2_ardour/au_pluginui.mm
View file

@ -131,7 +131,7 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
smaller_hbox->set_spacing (6); smaller_hbox->set_spacing (6);
smaller_hbox->pack_start (preset_label, false, false, 4); 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); smaller_hbox->pack_start (save_button, false, false);
#if 0 #if 0
/* one day these might be useful with an AU plugin, but not yet */ /* one day these might be useful with an AU plugin, but not yet */
@ -158,7 +158,7 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
pack_start (low_box, false, false); pack_start (low_box, false, false);
preset_label.show (); preset_label.show ();
preset_combo.show (); _preset_combo.show ();
automation_mode_label.show (); automation_mode_label.show ();
automation_mode_selector.show (); automation_mode_selector.show ();
bypass_button.show (); bypass_button.show ();
@ -276,7 +276,7 @@ AUPluginUI::create_cocoa_view ()
UInt32 dataSize; UInt32 dataSize;
Boolean isWritable; Boolean isWritable;
NSString* factoryClassName = 0; NSString* factoryClassName = 0;
NSURL* CocoaViewBundlePath; NSURL* CocoaViewBundlePath = NULL;
OSStatus result = AudioUnitGetPropertyInfo (*au->get_au(), OSStatus result = AudioUnitGetPropertyInfo (*au->get_au(),
kAudioUnitProperty_CocoaUI, kAudioUnitProperty_CocoaUI,

2
gtk2_ardour/audio_clock.cc
View file

@ -1006,7 +1006,7 @@ AudioClock::button_press (GdkEventButton *ev, CairoCell* cell)
} }
bool bool
AudioClock::button_release (GdkEventButton *ev, CairoCell* cell) AudioClock::button_release (GdkEventButton *ev, CairoCell*)
{ {
if (editable) { if (editable) {
if (dragging) { if (dragging) {

5
gtk2_ardour/audio_region_editor.cc
View file

@ -96,10 +96,9 @@ AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion>
AudioRegionEditor::~AudioRegionEditor () AudioRegionEditor::~AudioRegionEditor ()
{ {
pthread_cancel_one (_peak_amplitude_thread_handle);
void* v; void* v;
int const r = pthread_join (_peak_amplitude_thread_handle, &v); pthread_cancel_one (_peak_amplitude_thread_handle);
assert (r == 0); pthread_join (_peak_amplitude_thread_handle, &v);
} }
void void

2
gtk2_ardour/automation_time_axis.cc
View file

@ -955,7 +955,7 @@ AutomationTimeAxisView::set_state_2X (const XMLNode& node, int /*version*/)
} }
int int
AutomationTimeAxisView::set_state (const XMLNode& node, int /*version*/) AutomationTimeAxisView::set_state (const XMLNode&, int /*version*/)
{ {
return 0; return 0;
} }

3
gtk2_ardour/canvas-simpleline.c
View file

@ -389,7 +389,7 @@ gnome_canvas_simpleline_render (GnomeCanvasItem *item,
} }
static void static void
gnome_canvas_simpleline_draw (GnomeCanvasItem *item, gnome_canvas_simpleline_draw (GnomeCanvasItem *canvas,
GdkDrawable *drawable, GdkDrawable *drawable,
int x, int y, int x, int y,
int width, int height) int width, int height)
@ -414,7 +414,6 @@ gnome_canvas_simpleline_point (GnomeCanvasItem *item, double x, double y, int cx
(void) cx; (void) cx;
(void) cy; (void) cy;
GnomeCanvasSimpleLine *simpleline;
double x1, y1, x2, y2; double x1, y1, x2, y2;
double dx, dy; double dx, dy;

4
gtk2_ardour/editor_canvas.cc
View file

@ -890,7 +890,7 @@ Editor::set_canvas_cursor (Gdk::Cursor* cursor, bool save)
} }
bool 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 */ /* 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)) { 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 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)) { if (mouse_mode == Editing::MouseZoom && !Keyboard::the_keyboard().key_is_down (GDK_Control_L)) {
set_canvas_cursor (_cursors->zoom_in, true); set_canvas_cursor (_cursors->zoom_in, true);

2
gtk2_ardour/editor_canvas_events.cc
View file

@ -1084,7 +1084,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const & /*c*/,
} }
bool bool
Editor::key_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType type) Editor::key_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType)
{ {
return false; return false;
} }

2
gtk2_ardour/editor_drag.cc
View file

@ -2736,7 +2736,7 @@ MarkerDrag::aborted (bool)
} }
void void
MarkerDrag::update_item (Location* location) MarkerDrag::update_item (Location*)
{ {
/* noop */ /* noop */
} }

10
gtk2_ardour/editor_mouse.cc
View file

@ -1806,7 +1806,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
} }
bool bool
Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type) Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
{ {
AutomationLine* al; AutomationLine* al;
ControlPoint* cp; ControlPoint* cp;
@ -2417,7 +2417,7 @@ Editor::track_height_step_timeout ()
} }
void 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); assert (region_view);
@ -2439,7 +2439,7 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView*
} }
void 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); assert (region_view);
@ -2454,7 +2454,7 @@ Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionV
} }
void 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); assert (region_view);
@ -2584,7 +2584,7 @@ Editor::set_internal_edit (bool yn)
* used by the `join object/range' tool mode. * used by the `join object/range' tool mode.
*/ */
void 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; /* 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 entered_{track,regionview} is not always setup (e.g. if the mouse is over a TimeSelection), and to get a Region

2
gtk2_ardour/editor_ops.cc
View file

@ -5006,7 +5006,7 @@ void
Editor::toggle_region_fades (int dir) Editor::toggle_region_fades (int dir)
{ {
boost::shared_ptr<AudioRegion> ar; boost::shared_ptr<AudioRegion> ar;
bool yn; bool yn = false;
RegionSelection rs = get_regions_from_selection_and_entered (); RegionSelection rs = get_regions_from_selection_and_entered ();

4
gtk2_ardour/editor_regions.cc
View file

@ -214,7 +214,7 @@ EditorRegions::focus_out (GdkEventFocus*)
} }
bool bool
EditorRegions::enter_notify (GdkEventCrossing* ev) EditorRegions::enter_notify (GdkEventCrossing*)
{ {
if (name_editable) { if (name_editable) {
return true; return true;
@ -743,7 +743,7 @@ EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row co
#endif #endif
void void
EditorRegions::populate_row_used (boost::shared_ptr<Region> region, TreeModel::Row const& row, uint32_t used) EditorRegions::populate_row_used (boost::shared_ptr<Region>, TreeModel::Row const& row, uint32_t used)
{ {
char buf[8]; char buf[8];
snprintf (buf, sizeof (buf), "%4d" , used); snprintf (buf, sizeof (buf), "%4d" , used);

2
gtk2_ardour/editor_rulers.cc
View file

@ -1746,7 +1746,7 @@ Editor::set_samples_ruler_scale (framepos_t lower, framepos_t upper)
} }
gint 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 pos;
framepos_t const ilower = (framepos_t) floor (lower); framepos_t const ilower = (framepos_t) floor (lower);

2
gtk2_ardour/editor_selection.cc
View file

@ -1230,7 +1230,7 @@ Editor::select_all_in_track (Selection::Operation op)
} }
void void
Editor::select_all_internal_edit (Selection::Operation op) Editor::select_all_internal_edit (Selection::Operation)
{ {
/* currently limited to MIDI only */ /* currently limited to MIDI only */

2
gtk2_ardour/gain_meter.cc
View file

@ -634,7 +634,7 @@ GainMeterBase::gain_slider_button_press (GdkEventButton* ev)
} }
bool bool
GainMeterBase::gain_slider_button_release (GdkEventButton* ev) GainMeterBase::gain_slider_button_release (GdkEventButton*)
{ {
_amp->gain_control()->stop_touch (false, _amp->session().transport_frame()); _amp->gain_control()->stop_touch (false, _amp->session().transport_frame());
return true; return true;

4
gtk2_ardour/group_tabs.cc
View file

@ -603,7 +603,7 @@ GroupTabs::route_group_property_changed (RouteGroup* rg)
} }
void void
GroupTabs::route_added_to_route_group (RouteGroup* rg, boost::weak_ptr<Route> w) GroupTabs::route_added_to_route_group (RouteGroup*, boost::weak_ptr<Route> w)
{ {
/* Similarly-spirited hack as in route_group_property_changed */ /* Similarly-spirited hack as in route_group_property_changed */
@ -616,7 +616,7 @@ GroupTabs::route_added_to_route_group (RouteGroup* rg, boost::weak_ptr<Route> w)
} }
void void
GroupTabs::route_removed_from_route_group (RouteGroup* rg, boost::weak_ptr<Route> w) GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr<Route> w)
{ {
/* Similarly-spirited hack as in route_group_property_changed */ /* Similarly-spirited hack as in route_group_property_changed */

6
gtk2_ardour/gtk_pianokeyboard.c
View file

@ -352,7 +352,7 @@ bind_keys_azerty(PianoKeyboard *pk)
} }
static gint static gint
keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer notused) keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer ignored)
{ {
int note; int note;
char *key; char *key;
@ -433,7 +433,7 @@ get_note_for_xy(PianoKeyboard *pk, int x, int y)
} }
static gboolean 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 x = event->x;
int y = event->y; int y = event->y;
@ -473,7 +473,7 @@ mouse_button_event_handler(PianoKeyboard *pk, GdkEventButton *event, gpointer no
} }
static gboolean static gboolean
mouse_motion_event_handler(PianoKeyboard *pk, GdkEventMotion *event, gpointer notused) mouse_motion_event_handler(PianoKeyboard *pk, GdkEventMotion *event, gpointer ignored)
{ {
int note; int note;

2
gtk2_ardour/location_ui.cc
View file

@ -593,7 +593,7 @@ LocationEditRow::preemph_toggled ()
} }
void void
LocationEditRow::end_changed (ARDOUR::Location *loc) LocationEditRow::end_changed (ARDOUR::Location *)
{ {
ENSURE_GUI_THREAD (*this, &LocationEditRow::end_changed, loc) ENSURE_GUI_THREAD (*this, &LocationEditRow::end_changed, loc)

4
gtk2_ardour/midi_region_view.cc
View file

@ -388,7 +388,7 @@ MidiRegionView::enter_notify (GdkEventCrossing* ev)
} }
bool bool
MidiRegionView::leave_notify (GdkEventCrossing* ev) MidiRegionView::leave_notify (GdkEventCrossing*)
{ {
_mouse_mode_connection.disconnect (); _mouse_mode_connection.disconnect ();
@ -850,7 +850,7 @@ void
MidiRegionView::channel_edit () MidiRegionView::channel_edit ()
{ {
bool first = true; bool first = true;
uint8_t current_channel; uint8_t current_channel = 0;
if (_selection.empty()) { if (_selection.empty()) {
return; return;

2
gtk2_ardour/mixer_strip.cc
View file

@ -1880,7 +1880,7 @@ MixerStrip::hide_things ()
} }
bool bool
MixerStrip::input_active_button_press (GdkEventButton* ev) MixerStrip::input_active_button_press (GdkEventButton*)
{ {
/* nothing happens on press */ /* nothing happens on press */
return true; return true;

2
gtk2_ardour/monitor_section.cc
View file

@ -762,7 +762,7 @@ MonitorSection::setup_knob_images ()
void void
MonitorSection::update_solo_model () MonitorSection::update_solo_model ()
{ {
const char* action_name; const char* action_name = 0;
Glib::RefPtr<Action> act; Glib::RefPtr<Action> act;
if (Config->get_solo_control_is_listen_control()) { if (Config->get_solo_control_is_listen_control()) {

6
gtk2_ardour/mono_panner.cc
View file

@ -121,7 +121,7 @@ MonoPanner::value_change ()
} }
bool bool
MonoPanner::on_expose_event (GdkEventExpose* ev) MonoPanner::on_expose_event (GdkEventExpose*)
{ {
Glib::RefPtr<Gdk::Window> win (get_window()); Glib::RefPtr<Gdk::Window> win (get_window());
Glib::RefPtr<Gdk::GC> gc (get_style()->get_base_gc (get_state())); Glib::RefPtr<Gdk::GC> gc (get_style()->get_base_gc (get_state()));
@ -469,13 +469,13 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
} }
bool bool
MonoPanner::on_key_release_event (GdkEventKey* ev) MonoPanner::on_key_release_event (GdkEventKey*)
{ {
return false; return false;
} }
bool bool
MonoPanner::on_enter_notify_event (GdkEventCrossing* ev) MonoPanner::on_enter_notify_event (GdkEventCrossing*)
{ {
grab_focus (); grab_focus ();
Keyboard::magic_widget_grab_focus (); Keyboard::magic_widget_grab_focus ();

2
gtk2_ardour/panner2d.cc
View file

@ -853,7 +853,7 @@ Panner2dWindow::on_key_press_event (GdkEventKey* event)
} }
bool bool
Panner2dWindow::on_key_release_event (GdkEventKey *event) Panner2dWindow::on_key_release_event (GdkEventKey*)
{ {
return true; return true;
} }

2
gtk2_ardour/region_view.cc
View file

@ -224,7 +224,7 @@ RegionView::~RegionView ()
} }
void void
RegionView::set_silent_frames (const AudioIntervalResult& silences, double threshold) RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*threshold*/)
{ {
framecnt_t shortest = max_framecnt; framecnt_t shortest = max_framecnt;

4
gtk2_ardour/route_time_axis.cc
View file

@ -1875,7 +1875,7 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor>
} }
void void
RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, boost::shared_ptr<Processor> i) RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, boost::shared_ptr<Processor>)
{ {
if (!_hidden) { if (!_hidden) {
pan->menu_item->set_active (false); pan->menu_item->set_active (false);
@ -2281,7 +2281,7 @@ RouteTimeAxisView::set_underlay_state()
} }
void void
RouteTimeAxisView::add_underlay (StreamView* v, bool update_xml) RouteTimeAxisView::add_underlay (StreamView* v, bool /*update_xml*/)
{ {
if (!v) { if (!v) {
return; return;

2
gtk2_ardour/shuttle_control.cc
View file

@ -483,7 +483,7 @@ ShuttleControl::use_shuttle_fract (bool force)
} }
bool bool
ShuttleControl::on_expose_event (GdkEventExpose* event) ShuttleControl::on_expose_event (GdkEventExpose*)
{ {
cairo_text_extents_t extents; cairo_text_extents_t extents;
Glib::RefPtr<Gdk::Window> win (get_window()); Glib::RefPtr<Gdk::Window> win (get_window());

4
gtk2_ardour/stereo_panner.cc
View file

@ -619,13 +619,13 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
} }
bool bool
StereoPanner::on_key_release_event (GdkEventKey* ev) StereoPanner::on_key_release_event (GdkEventKey*)
{ {
return false; return false;
} }
bool bool
StereoPanner::on_enter_notify_event (GdkEventCrossing* ev) StereoPanner::on_enter_notify_event (GdkEventCrossing*)
{ {
grab_focus (); grab_focus ();
Keyboard::magic_widget_grab_focus (); Keyboard::magic_widget_grab_focus ();

2
gtk2_ardour/time_axis_view.cc
View file

@ -397,7 +397,7 @@ TimeAxisView::controls_ebox_motion (GdkEventMotion* ev)
} }
bool bool
TimeAxisView::controls_ebox_leave (GdkEventCrossing* ev) TimeAxisView::controls_ebox_leave (GdkEventCrossing*)
{ {
if (_have_preresize_cursor) { if (_have_preresize_cursor) {
gdk_window_set_cursor (controls_ebox.get_window()->gobj(), _preresize_cursor); gdk_window_set_cursor (controls_ebox.get_window()->gobj(), _preresize_cursor);

2
gtk2_ardour/time_axis_view_item.cc
View file

@ -109,7 +109,7 @@ TimeAxisViewItem::TimeAxisViewItem(
} }
TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
: sigc::trackable(other) : Selectable (other)
, PBD::ScopedConnectionList() , PBD::ScopedConnectionList()
, trackview (other.trackview) , trackview (other.trackview)
, _recregion (other._recregion) , _recregion (other._recregion)

2
libs/appleutility/CAAudioChannelLayout.h
View file

@ -150,7 +150,7 @@ private:
private: private:
ACLRefCounter () : mLayout(NULL) { } ACLRefCounter () : mLayout(NULL) { }
ACLRefCounter(const ACLRefCounter&) : mLayout(NULL) { } ACLRefCounter(const ACLRefCounter& other) : CAReferenceCounted (other), mLayout(NULL) { }
ACLRefCounter& operator=(const ACLRefCounter&) { return *this; } ACLRefCounter& operator=(const ACLRefCounter&) { return *this; }
}; };

14
libs/appleutility/CAAudioUnit.cpp
View file

@ -191,7 +191,7 @@ private:
private: private:
// get the compiler to tell us when we do a bad thing!!! // get the compiler to tell us when we do a bad thing!!!
AUState () {} AUState () {}
AUState (const AUState&) {} AUState (const AUState& other) : CAReferenceCounted (other) {}
AUState& operator= (const AUState&) { return *this; } AUState& operator= (const AUState&) { return *this; }
}; };
@ -1084,13 +1084,13 @@ bool CAAudioUnit::HasCustomView () const
OSStatus CAAudioUnit::GetParameter(AudioUnitParameterID inID, AudioUnitScope scope, AudioUnitElement element, OSStatus CAAudioUnit::GetParameter(AudioUnitParameterID inID, AudioUnitScope scope, AudioUnitElement element,
Float32 &outValue) const 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, OSStatus CAAudioUnit::SetParameter(AudioUnitParameterID inID, AudioUnitScope scope, AudioUnitElement element,
Float32 value, UInt32 bufferOffsetFrames) 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, OSStatus CAAudioUnit::MIDIEvent (UInt32 inStatus,
@ -1098,7 +1098,7 @@ OSStatus CAAudioUnit::MIDIEvent (UInt32 inStatus,
UInt32 inData2, UInt32 inData2,
UInt32 inOffsetSampleFrame) 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, OSStatus CAAudioUnit::StartNote (MusicDeviceInstrumentID inInstrument,
@ -1107,7 +1107,7 @@ OSStatus CAAudioUnit::StartNote (MusicDeviceInstrumentID inInstrument,
UInt32 inOffsetSampleFrame, UInt32 inOffsetSampleFrame,
const MusicDeviceNoteParams * inParams) const MusicDeviceNoteParams * inParams)
{ {
return mDataPtr ? mDataPtr->StartNote (inInstrument, inGroupID, outNoteInstanceID, inOffsetSampleFrame, inParams) return mDataPtr ? (OSStatus) mDataPtr->StartNote (inInstrument, inGroupID, outNoteInstanceID, inOffsetSampleFrame, inParams)
: paramErr; : paramErr;
} }
@ -1115,7 +1115,7 @@ OSStatus CAAudioUnit::StopNote (MusicDeviceGroupID inGroupID,
NoteInstanceID inNoteInstanceID, NoteInstanceID inNoteInstanceID,
UInt32 inOffsetSampleFrame) UInt32 inOffsetSampleFrame)
{ {
return mDataPtr ? mDataPtr->StopNote (inGroupID, inNoteInstanceID, inOffsetSampleFrame) : paramErr; return mDataPtr ? (OSStatus) mDataPtr->StopNote (inGroupID, inNoteInstanceID, inOffsetSampleFrame) : paramErr;
} }
#pragma mark __Render #pragma mark __Render
@ -1126,7 +1126,7 @@ OSStatus CAAudioUnit::Render (AudioUnitRenderActionFlags * ioActionFlags,
UInt32 inNumberFrames, UInt32 inNumberFrames,
AudioBufferList * ioData) 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; static AURenderCallbackStruct sRenderCallback;

2
libs/appleutility/CAReferenceCounted.h
View file

@ -71,11 +71,11 @@ public:
protected: protected:
virtual ~CAReferenceCounted() { } virtual ~CAReferenceCounted() { }
CAReferenceCounted(const CAReferenceCounted &) : mRefCount(0) { }
private: private:
SInt32 mRefCount; SInt32 mRefCount;
CAReferenceCounted(const CAReferenceCounted &) : mRefCount(0) { }
CAReferenceCounted operator=(const CAReferenceCounted &) { return *this; } CAReferenceCounted operator=(const CAReferenceCounted &) { return *this; }
}; };

5
libs/ardour/ardour/audio_unit.h
View file

@ -97,7 +97,6 @@ class AUPlugin : public ARDOUR::Plugin
int set_state(const XMLNode& node, int); int set_state(const XMLNode& node, int);
PresetRecord save_preset (std::string name);
bool load_preset (PresetRecord); bool load_preset (PresetRecord);
std::string current_preset() const; 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&); 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: private:
void find_presets (); void find_presets ();

2
libs/ardour/ardour/audiosource.h
View file

@ -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 read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const = 0;
virtual framecnt_t write_unlocked (Sample *dst, framecnt_t cnt) = 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 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); } std::string audio_path) { return peak_path (audio_path); }
virtual int read_peaks_with_fpp (PeakData *peaks, virtual int read_peaks_with_fpp (PeakData *peaks,

6
libs/ardour/ardour/caimportable.h
View file

@ -33,11 +33,11 @@ class CAImportableSource : public ImportableSource {
CAImportableSource (const std::string& path); CAImportableSource (const std::string& path);
virtual ~CAImportableSource(); virtual ~CAImportableSource();
nframes_t read (Sample* buffer, nframes_t nframes); framecnt_t read (Sample* buffer, framecnt_t nframes);
uint32_t channels() const; uint32_t channels() const;
framecnt_t length() const; framecnt_t length() const;
nframes_t samplerate() const; framecnt_t samplerate() const;
void seek (nframes_t pos); void seek (framepos_t pos);
framepos_t natural_position() const { return 0; } framepos_t natural_position() const { return 0; }
bool clamped_at_unity () const { return false; } bool clamped_at_unity () const { return false; }

2
libs/ardour/ardour/coreaudiosource.h
View file

@ -54,7 +54,7 @@ class CoreAudioSource : public AudioFileSource {
uint16_t n_channels; uint16_t n_channels;
void init_cafile (); 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 */ }; /* namespace ARDOUR */

2
libs/ardour/ardour/export_channel.h
View file

@ -47,7 +47,7 @@ class ExportChannel : public boost::less_than_comparable<ExportChannel>
virtual ~ExportChannel () {} 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 void read (Sample const *& data, framecnt_t frames) const = 0;
virtual bool empty () const = 0; virtual bool empty () const = 0;

8
libs/ardour/ardour/lxvst_plugin.h
View file

@ -73,10 +73,10 @@ class LXVSTPlugin : public ARDOUR::Plugin
std::string state_node_name() const { return "lxvst"; } std::string state_node_name() const { return "lxvst"; }
void print_parameter (uint32_t, char*, uint32_t len) const; void print_parameter (uint32_t, char*, uint32_t len) const;
bool parameter_is_audio(uint32_t i) const { return false; } bool parameter_is_audio(uint32_t) const { return false; }
bool parameter_is_control(uint32_t i) const { return true; } bool parameter_is_control(uint32_t) const { return true; }
bool parameter_is_input(uint32_t i) const { return true; } bool parameter_is_input(uint32_t) const { return true; }
bool parameter_is_output(uint32_t i) const { return false; } bool parameter_is_output(uint32_t) const { return false; }
bool load_preset (PresetRecord); bool load_preset (PresetRecord);
int first_user_preset_index () const; int first_user_preset_index () const;

3
libs/ardour/ardour/plugin.h
View file

@ -136,8 +136,7 @@ class Plugin : public PBD::StatefulDestructible, public Latent
typedef std::map<const std::string, const float> ScalePoints; typedef std::map<const std::string, const float> ScalePoints;
virtual boost::shared_ptr<ScalePoints> virtual boost::shared_ptr<ScalePoints> get_scale_points(uint32_t /*port_index*/) const {
get_scale_points(uint32_t port_index) const {
return boost::shared_ptr<ScalePoints>(); return boost::shared_ptr<ScalePoints>();
} }

2
libs/ardour/audio_playlist_source.cc
View file

@ -171,7 +171,7 @@ AudioPlaylistSource::read_unlocked (Sample* dst, framepos_t start, framecnt_t cn
} }
framecnt_t 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; fatal << string_compose (_("programming error: %1"), "AudioPlaylistSource::write() called - should be impossible") << endmsg;
/*NOTREACHED*/ /*NOTREACHED*/

2
libs/ardour/audio_port.cc
View file

@ -53,7 +53,7 @@ AudioPort::cycle_start (pframes_t nframes)
} }
void void
AudioPort::cycle_end (pframes_t nframes) AudioPort::cycle_end (pframes_t)
{ {
if (sends_output() && !_buffer->written()) { if (sends_output() && !_buffer->written()) {
/* we can't use nframes here because the current buffer capacity may /* we can't use nframes here because the current buffer capacity may

38
libs/ardour/audio_unit.cc
View file

@ -1341,7 +1341,7 @@ AUPlugin::get_beat_and_tempo_callback (Float64* outCurrentBeat,
float beat; float beat;
beat = metric.meter().beats_per_bar() * bbt.bars; beat = metric.meter().beats_per_bar() * bbt.bars;
beat += bbt.beats; beat += bbt.beats;
beat += bbt.ticks / BBT_Time::ticks_per_beat; beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat;
*outCurrentBeat = beat; *outCurrentBeat = beat;
} }
@ -1381,7 +1381,8 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe
/* on the beat */ /* on the beat */
*outDeltaSampleOffsetToNextBeat = 0; *outDeltaSampleOffsetToNextBeat = 0;
} else { } else {
*outDeltaSampleOffsetToNextBeat = (UInt32) floor (((BBT_Time::ticks_per_beat - bbt.ticks)/BBT_Time::ticks_per_beat) * // fraction of a beat to next 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 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; float beat;
beat = metric.meter().beats_per_bar() * bbt.bars; beat = metric.meter().beats_per_bar() * bbt.bars;
beat += bbt.beats; beat += bbt.beats;
beat += bbt.ticks / BBT_Time::ticks_per_beat; beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat;
*outCycleStartBeat = beat; *outCycleStartBeat = beat;
} }
@ -1485,7 +1486,7 @@ AUPlugin::get_transport_state_callback (Boolean* outIsPlaying,
float beat; float beat;
beat = metric.meter().beats_per_bar() * bbt.bars; beat = metric.meter().beats_per_bar() * bbt.bars;
beat += bbt.beats; beat += bbt.beats;
beat += bbt.ticks / BBT_Time::ticks_per_beat; beat += bbt.ticks / Timecode::BBT_Time::ticks_per_beat;
*outCycleEndBeat = beat; *outCycleEndBeat = beat;
} }
@ -1554,7 +1555,7 @@ AUPlugin::parameter_is_output (uint32_t) const
} }
void void
AUPlugin::add_state (XMLNode* root) AUPlugin::add_state (XMLNode* root) const
{ {
LocaleGuard lg (X_("POSIX")); LocaleGuard lg (X_("POSIX"));
@ -1573,7 +1574,7 @@ AUPlugin::add_state (XMLNode* root)
if (!xmlData) { if (!xmlData) {
error << _("Could not create XML version of property list") << endmsg; 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 /* 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 bool
AUPlugin::load_preset (PluginRecord r) AUPlugin::load_preset (PresetRecord r)
{ {
Plugin::load_preset (r); Plugin::load_preset (r);
@ -1675,7 +1676,7 @@ AUPlugin::load_preset (PluginRecord r)
/* look first in "user" presets */ /* 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) { if ((propertyList = load_property_list (ux->second)) != 0) {
TRACE_API ("set preset from user presets\n"); TRACE_API ("set preset from user presets\n");
@ -1692,7 +1693,7 @@ AUPlugin::load_preset (PluginRecord r)
CFRelease(propertyList); 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; AUPreset preset;
@ -1725,8 +1726,13 @@ AUPlugin::load_preset (PluginRecord r)
#endif #endif
} }
PresetRecord void
AUPlugin::save_preset (string preset_name) AUPlugin::do_remove_preset (std::string)
{
}
string
AUPlugin::do_save_preset (string preset_name)
{ {
#ifdef AU_STATE_SUPPORT #ifdef AU_STATE_SUPPORT
CFPropertyListRef propertyList; CFPropertyListRef propertyList;
@ -1776,7 +1782,7 @@ AUPlugin::save_preset (string preset_name)
CFRelease(propertyList); CFRelease(propertyList);
return ret; return string ("file:///") + user_preset_path;
#else #else
if (!seen_saving_message) { if (!seen_saving_message) {
info << string_compose (_("Saving AudioUnit presets is not supported in this build of %1. Consider paying for a newer version"), 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; << endmsg;
seen_saving_message = true; seen_saving_message = true;
} }
return false; return string();
#endif #endif
} }
@ -2006,7 +2012,7 @@ AUPlugin::find_presets ()
/* now fill the vector<string> with the names we have */ /* now fill the vector<string> with the names we have */
for (UserPresetMap::iterator i = user_preset_map.begin(); i != user_preset_map.end(); ++i) { 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 */ /* add factory presets */
@ -2014,7 +2020,7 @@ AUPlugin::find_presets ()
for (FactoryPresetMap::iterator i = factory_preset_map.begin(); i != factory_preset_map.end(); ++i) { for (FactoryPresetMap::iterator i = factory_preset_map.begin(); i != factory_preset_map.end(); ++i) {
/* XXX: dubious */ /* XXX: dubious */
string const uri = string_compose ("%1", _presets.size ()); 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 #endif
@ -2082,10 +2088,12 @@ AUPluginInfo::discover ()
PluginInfoList* plugs = new PluginInfoList; PluginInfoList* plugs = new PluginInfoList;
#if 0
discover_fx (*plugs); discover_fx (*plugs);
discover_music (*plugs); discover_music (*plugs);
discover_generators (*plugs); discover_generators (*plugs);
discover_instruments (*plugs); discover_instruments (*plugs);
#endif
return plugs; return plugs;
} }

4
libs/ardour/export_channel.cc
View file

@ -241,13 +241,13 @@ RouteExportChannel::read (Sample const *& data, framecnt_t frames) const
} }
void void
RouteExportChannel::get_state (XMLNode * node) const RouteExportChannel::get_state (XMLNode *) const
{ {
// TODO // TODO
} }
void void
RouteExportChannel::set_state (XMLNode * node, Session & session) RouteExportChannel::set_state (XMLNode *, Session &)
{ {
// TODO // TODO
} }

2
libs/ardour/file_source.cc
View file

@ -235,7 +235,7 @@ FileSource::move_to_trash (const string& trash_dir_name)
*/ */
bool bool
FileSource::find (Session& s, DataType type, const string& path, bool must_exist, 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; bool ret = false;
string keeppath; string keeppath;

2
libs/ardour/ladspa_plugin.cc
View file

@ -761,7 +761,7 @@ LadspaPlugin::load_preset (PresetRecord r)
/* XXX: should be in liblrdf */ /* XXX: should be in liblrdf */
static void 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 p;
lrdf_statement *q; lrdf_statement *q;

4
libs/ardour/lxvst_plugin.cc
View file

@ -125,7 +125,7 @@ LXVSTPlugin::set_block_size (pframes_t nframes)
} }
float float
LXVSTPlugin::default_value (uint32_t port) LXVSTPlugin::default_value (uint32_t)
{ {
return 0; return 0;
} }
@ -653,7 +653,7 @@ LXVSTPlugin::has_editor () const
} }
void 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; char *first_nonws;

1
libs/ardour/midi_diskstream.cc
View file

@ -291,6 +291,7 @@ MidiDiskstream::use_copy_playlist ()
int int
MidiDiskstream::set_destructive (bool yn) MidiDiskstream::set_destructive (bool yn)
{ {
yn = 0; // stop pedantic gcc complaints about unused parameter
assert( ! destructive()); assert( ! destructive());
assert( ! yn); assert( ! yn);
return -1; return -1;

12
libs/ardour/midi_playlist_source.cc
View file

@ -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<MidiPlaylist> p, MidiPlaylistSource::MidiPlaylistSource (Session& s, const ID& orig, const std::string& name, boost::shared_ptr<MidiPlaylist> 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) : Source (s, DataType::MIDI, name)
, MidiSource (s, name, flags) , MidiSource (s, name, flags)
, PlaylistSource (s, orig, name, p, DataType::MIDI, begin, len, flags) , PlaylistSource (s, orig, name, p, DataType::MIDI, begin, len, flags)
@ -128,9 +128,9 @@ MidiPlaylistSource::length (framepos_t) const
framepos_t framepos_t
MidiPlaylistSource::read_unlocked (Evoral::EventSink<framepos_t>& dst, MidiPlaylistSource::read_unlocked (Evoral::EventSink<framepos_t>& dst,
framepos_t position, framepos_t /*position*/,
framepos_t start, framecnt_t cnt, framepos_t start, framecnt_t cnt,
MidiStateTracker* tracker) const MidiStateTracker*) const
{ {
boost::shared_ptr<MidiPlaylist> mp = boost::dynamic_pointer_cast<MidiPlaylist> (_playlist); boost::shared_ptr<MidiPlaylist> mp = boost::dynamic_pointer_cast<MidiPlaylist> (_playlist);
@ -143,8 +143,8 @@ MidiPlaylistSource::read_unlocked (Evoral::EventSink<framepos_t>& dst,
framepos_t framepos_t
MidiPlaylistSource::write_unlocked (MidiRingBuffer<framepos_t>& dst, MidiPlaylistSource::write_unlocked (MidiRingBuffer<framepos_t>& dst,
framepos_t position, framepos_t,
framecnt_t cnt) framecnt_t)
{ {
fatal << string_compose (_("programming error: %1"), "MidiPlaylistSource::write_unlocked() called - should be impossible") << endmsg; fatal << string_compose (_("programming error: %1"), "MidiPlaylistSource::write_unlocked() called - should be impossible") << endmsg;
/*NOTREACHED*/ /*NOTREACHED*/
@ -159,7 +159,7 @@ MidiPlaylistSource::append_event_unlocked_beats(const Evoral::Event<Evoral::Musi
} }
void void
MidiPlaylistSource::append_event_unlocked_frames(const Evoral::Event<framepos_t>& ev, framepos_t source_start) MidiPlaylistSource::append_event_unlocked_frames(const Evoral::Event<framepos_t>& /* ev */, framepos_t /*source_start*/)
{ {
fatal << string_compose (_("programming error: %1"), "MidiPlaylistSource::append_event_unlocked_frames() called - should be impossible") << endmsg; fatal << string_compose (_("programming error: %1"), "MidiPlaylistSource::append_event_unlocked_frames() called - should be impossible") << endmsg;
/*NOTREACHED*/ /*NOTREACHED*/

2
libs/ardour/midi_port.cc
View file

@ -155,7 +155,7 @@ MidiPort::resolve_notes (void* jack_buffer, MidiBuffer::TimeType when)
} }
void void
MidiPort::flush_buffers (pframes_t nframes, framepos_t time) MidiPort::flush_buffers (pframes_t nframes, framepos_t /*time*/)
{ {
if (sends_output ()) { if (sends_output ()) {

2
libs/ardour/midi_stretch.cc
View file

@ -42,7 +42,7 @@ MidiStretch::~MidiStretch ()
} }
int int
MidiStretch::run (boost::shared_ptr<Region> r, Progress* progress) MidiStretch::run (boost::shared_ptr<Region> r, Progress*)
{ {
SourceList nsrcs; SourceList nsrcs;
char suffix[32]; char suffix[32];

2
libs/ardour/pannable.cc
View file

@ -182,7 +182,7 @@ Pannable::get_state ()
} }
XMLNode& XMLNode&
Pannable::state (bool full) Pannable::state (bool /*full*/)
{ {
XMLNode* node = new XMLNode (X_("Pannable")); XMLNode* node = new XMLNode (X_("Pannable"));

4
libs/ardour/playlist_source.cc
View file

@ -44,7 +44,7 @@ using namespace ARDOUR;
using namespace PBD; using namespace PBD;
PlaylistSource::PlaylistSource (Session& s, const ID& orig, const std::string& name, boost::shared_ptr<Playlist> p, DataType type, PlaylistSource::PlaylistSource (Session& s, const ID& orig, const std::string& name, boost::shared_ptr<Playlist> 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) : Source (s, type, name)
, _playlist (p) , _playlist (p)
, _original (orig) , _original (orig)
@ -92,7 +92,7 @@ PlaylistSource::add_state (XMLNode& node)
} }
int int
PlaylistSource::set_state (const XMLNode& node, int version) PlaylistSource::set_state (const XMLNode& node, int /*version*/)
{ {
/* check that we have a playlist ID */ /* check that we have a playlist ID */

4
libs/ardour/plugin.cc
View file

@ -236,7 +236,7 @@ Plugin::preset_by_uri (const string& uri)
int int
Plugin::connect_and_run (BufferSet& bufs, Plugin::connect_and_run (BufferSet& bufs,
ChanMapping in_map, ChanMapping out_map, ChanMapping /*in_map*/, ChanMapping /*out_map*/,
pframes_t nframes, framecnt_t offset) pframes_t nframes, framecnt_t offset)
{ {
if (bufs.count().n_midi() > 0) { if (bufs.count().n_midi() > 0) {
@ -306,7 +306,7 @@ Plugin::set_parameter (uint32_t which, float val)
} }
int 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")); XMLProperty const * p = node.property (X_("last-preset-uri"));
if (p) { if (p) {

2
libs/ardour/plugin_manager.cc
View file

@ -652,7 +652,7 @@ PluginManager::add_lxvst_directory (string path)
return -1; 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" */ /* Not a dotfile, has a prefix before a period, suffix is "so" */

4
libs/ardour/port.cc
View file

@ -230,7 +230,7 @@ Port::reset ()
} }
void void
Port::cycle_start (pframes_t nframes) Port::cycle_start (pframes_t)
{ {
_port_buffer_offset = 0; _port_buffer_offset = 0;
} }
@ -307,7 +307,7 @@ Port::private_latency_range (bool playback) const
} }
jack_latency_range_t jack_latency_range_t
Port::public_latency_range (bool playback) const Port::public_latency_range (bool /*playback*/) const
{ {
jack_latency_range_t r; jack_latency_range_t r;

1
libs/ardour/processor.cc
View file

@ -76,6 +76,7 @@ Processor::Processor (const Processor& other)
: Evoral::ControlSet (other) : Evoral::ControlSet (other)
, SessionObject (other.session(), other.name()) , SessionObject (other.session(), other.name())
, Automatable (other.session()) , Automatable (other.session())
, Latent (other)
, _pending_active(other._pending_active) , _pending_active(other._pending_active)
, _active(other._active) , _active(other._active)
, _next_ab_is_active(false) , _next_ab_is_active(false)

2
libs/ardour/session.cc
View file

@ -2511,7 +2511,7 @@ Session::io_name_is_legal (const std::string& name)
} }
void void
Session::set_exclusive_input_active (boost::shared_ptr<Route> rt, bool others_on) Session::set_exclusive_input_active (boost::shared_ptr<Route> rt, bool /*others_on*/)
{ {
RouteList rl; RouteList rl;
vector<string> connections; vector<string> connections;

2
libs/ardour/session_process.cc
View file

@ -617,7 +617,7 @@ Session::calculate_moving_average_of_slave_delta (int dir, framecnt_t this_delta
} }
void 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) { if (slave_speed != 0.0f) {

1
libs/ardour/speakers.cc
View file

@ -71,6 +71,7 @@ Speakers::Speakers ()
} }
Speakers::Speakers (const Speakers& s) Speakers::Speakers (const Speakers& s)
: Stateful ()
{ {
_speakers = s._speakers; _speakers = s._speakers;
} }

2
libs/ardour/vstfxinfofile.cc
View file

@ -297,7 +297,7 @@ static VSTFXInfo* vstfx_info_from_plugin(VSTFX *vstfx)
/* A simple 'dummy' audiomaster callback which should be ok, /* A simple 'dummy' audiomaster callback which should be ok,
we will only be instantiating the plugin in order to get its info*/ 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)

1
libs/audiographer/audiographer/debuggable.h
View file

@ -44,6 +44,7 @@ class Debuggable
bool debug_level (DebugLevel level) { bool debug_level (DebugLevel level) {
#ifdef NDEBUG #ifdef NDEBUG
level = DEFAULT_DEBUG_LEVEL; /* stop pedantic gcc complaints about unused parameter */
return false; return false;
#else #else
return L >= level; return L >= level;

4
libs/evoral/evoral/PatchChange.hpp
View file

@ -146,7 +146,9 @@ public:
case 2: case 2:
return _program_change; return _program_change;
default: default:
assert (false); abort ();
/*NOTREACHED*/
return _program_change;
} }
} }

2
libs/evoral/src/ControlSet.cpp
View file

@ -32,7 +32,7 @@ ControlSet::ControlSet()
{ {
} }
ControlSet::ControlSet (const ControlSet& other) ControlSet::ControlSet (const ControlSet&)
: noncopyable () : noncopyable ()
{ {
/* derived class must copy controls */ /* derived class must copy controls */

2
libs/evoral/src/Sequence.cpp
View file

@ -1249,7 +1249,7 @@ template<typename Time>
void void
Sequence<Time>::dump (ostream& str) const Sequence<Time>::dump (ostream& str) const
{ {
Sequence<Time>::const_iterator i; typename Sequence<Time>::const_iterator i;
str << "+++ dump\n"; str << "+++ dump\n";
for (i = begin(); i != end(); ++i) { for (i = begin(); i != end(); ++i) {
str << *i << endl; str << *i << endl;

9
libs/evoral/src/libsmf/smf_load.c
View file

@ -275,7 +275,8 @@ is_escape_byte(const unsigned char status)
static int32_t static int32_t
expected_sysex_length(const unsigned char status, const unsigned char *second_byte, const size_t buffer_length, int32_t *consumed_bytes) expected_sysex_length(const unsigned char status, const unsigned char *second_byte, const size_t buffer_length, int32_t *consumed_bytes)
{ {
uint32_t sysex_length, len; uint32_t sysex_length = 0;
uint32_t len = 0;
assert(status == 0xF0); assert(status == 0xF0);
@ -424,7 +425,8 @@ extract_escaped_event(const unsigned char *buf, const size_t buffer_length, smf_
(void) last_status; (void) last_status;
int status; int status;
int32_t message_length, vlq_length; int32_t message_length = 0;
int32_t vlq_length = 0;
const unsigned char *c = buf; const unsigned char *c = buf;
status = *buf; status = *buf;
@ -645,7 +647,8 @@ smf_event_is_textual(const smf_event_t *event)
char * char *
smf_event_extract_text(const smf_event_t *event) smf_event_extract_text(const smf_event_t *event)
{ {
uint32_t string_length, length_length; uint32_t string_length = 0;
uint32_t length_length = 0;
if (!smf_event_is_textual(event)) if (!smf_event_is_textual(event))
return (NULL); return (NULL);

1
libs/evoral/src/libsmf/smf_save.c
View file

@ -180,6 +180,7 @@ smf_format_vlq(unsigned char *buf, int length, unsigned long value)
} }
assert(i <= length); assert(i <= length);
length = length; // get rid of stupid gcc warnings about unused params if assert() is null
/* + 1, because "i" is an offset, not a count. */ /* + 1, because "i" is an offset, not a count. */
return (i + 1); return (i + 1);

8
libs/gnomecanvas/libgnomecanvas/gnome-canvas-rich-text.c
View file

@ -806,15 +806,15 @@ gnome_canvas_rich_text_move_cursor(GnomeCanvasRichText *text,
} /* gnome_canvas_rich_text_move_cursor */ } /* gnome_canvas_rich_text_move_cursor */
static gboolean static gboolean
whitespace(gunichar ch, gpointer user_data) whitespace(gunichar ch, gpointer ignored)
{ {
return (ch == ' ' || ch == '\t'); return (ch == ' ' || ch == '\t');
} /* whitespace */ } /* whitespace */
static gboolean static gboolean
not_whitespace(gunichar ch, gpointer user_data) not_whitespace(gunichar ch, gpointer ignored)
{ {
return !whitespace(ch, user_data); return !whitespace(ch, ignored);
} /* not_whitespace */ } /* not_whitespace */
static gboolean static gboolean
@ -911,7 +911,7 @@ gnome_canvas_rich_text_delete_from_cursor(GnomeCanvasRichText *text,
static gint static gint
selection_motion_event_handler(GnomeCanvasRichText *text, GdkEvent *event, selection_motion_event_handler(GnomeCanvasRichText *text, GdkEvent *event,
gpointer data) gpointer ignored)
{ {
GtkTextIter newplace; GtkTextIter newplace;
GtkTextMark *mark; GtkTextMark *mark;

2
libs/gnomecanvas/libgnomecanvas/gnome-canvas-widget.c
View file

@ -365,7 +365,7 @@ gnome_canvas_widget_set_property (GObject *object,
break; break;
case PROP_ANCHOR: case PROP_ANCHOR:
if (witem->anchor != g_value_get_enum (value)) if (witem->anchor != (unsigned int) g_value_get_enum (value))
{ {
witem->anchor = g_value_get_enum (value); witem->anchor = g_value_get_enum (value);
update = TRUE; update = TRUE;

12
libs/gtkmm2ext/bindings.cc
View file

@ -217,7 +217,7 @@ Bindings::set_action_map (ActionMap& am)
bool bool
Bindings::activate (KeyboardKey kb, Operation op) Bindings::activate (KeyboardKey kb, Operation op)
{ {
KeybindingMap* kbm; KeybindingMap* kbm = 0;
switch (op) { switch (op) {
case Press: case Press:
@ -244,7 +244,7 @@ Bindings::activate (KeyboardKey kb, Operation op)
void void
Bindings::add (KeyboardKey kb, Operation op, RefPtr<Action> what) Bindings::add (KeyboardKey kb, Operation op, RefPtr<Action> what)
{ {
KeybindingMap* kbm; KeybindingMap* kbm = 0;
switch (op) { switch (op) {
case Press: case Press:
@ -269,7 +269,7 @@ Bindings::add (KeyboardKey kb, Operation op, RefPtr<Action> what)
void void
Bindings::remove (KeyboardKey kb, Operation op) Bindings::remove (KeyboardKey kb, Operation op)
{ {
KeybindingMap* kbm; KeybindingMap* kbm = 0;
switch (op) { switch (op) {
case Press: case Press:
@ -290,7 +290,7 @@ Bindings::remove (KeyboardKey kb, Operation op)
bool bool
Bindings::activate (MouseButton bb, Operation op) Bindings::activate (MouseButton bb, Operation op)
{ {
MouseButtonBindingMap* bbm; MouseButtonBindingMap* bbm = 0;
switch (op) { switch (op) {
case Press: case Press:
@ -317,7 +317,7 @@ Bindings::activate (MouseButton bb, Operation op)
void void
Bindings::add (MouseButton bb, Operation op, RefPtr<Action> what) Bindings::add (MouseButton bb, Operation op, RefPtr<Action> what)
{ {
MouseButtonBindingMap* bbm; MouseButtonBindingMap* bbm = 0;
switch (op) { switch (op) {
case Press: case Press:
@ -342,7 +342,7 @@ Bindings::add (MouseButton bb, Operation op, RefPtr<Action> what)
void void
Bindings::remove (MouseButton bb, Operation op) Bindings::remove (MouseButton bb, Operation op)
{ {
MouseButtonBindingMap* bbm; MouseButtonBindingMap* bbm = 0;
switch (op) { switch (op) {
case Press: case Press:

4
libs/gtkmm2ext/cairocell.cc
View file

@ -232,13 +232,13 @@ CairoEditableText::on_scroll_event (GdkEventScroll* ev)
} }
bool bool
CairoEditableText::on_focus_in_event (GdkEventFocus* ev) CairoEditableText::on_focus_in_event (GdkEventFocus*)
{ {
return false; return false;
} }
bool bool
CairoEditableText::on_focus_out_event (GdkEventFocus* ev) CairoEditableText::on_focus_out_event (GdkEventFocus*)
{ {
if (editing_cell) { if (editing_cell) {
queue_draw_cell (editing_cell); queue_draw_cell (editing_cell);

15
libs/gtkmm2ext/gtkapplication_quartz.mm
View file

@ -24,6 +24,15 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include <sigc++/signal.h>
#include <sigc++/slot.h>
#include <string.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <gtkmm2ext/gtkapplication.h>
#include <gtkmm2ext/gtkapplication-private.h>
#import <AppKit/NSMenu.h> #import <AppKit/NSMenu.h>
#import <AppKit/NSMenuItem.h> #import <AppKit/NSMenuItem.h>
#import <AppKit/NSCell.h> #import <AppKit/NSCell.h>
@ -32,12 +41,6 @@
#import <Foundation/NSString.h> #import <Foundation/NSString.h>
#import <Foundation/NSNotification.h> #import <Foundation/NSNotification.h>
#include <string.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <gtkmm2ext/gtkapplication.h>
#include <gtkmm2ext/gtkapplication-private.h>
#define UNUSED_PARAMETER(a) (void) (a) #define UNUSED_PARAMETER(a) (void) (a)
// #define DEBUG(format, ...) g_printerr ("%s: " format, G_STRFUNC, ## __VA_ARGS__) // #define DEBUG(format, ...) g_printerr ("%s: " format, G_STRFUNC, ## __VA_ARGS__)

5
libs/gtkmm2ext/gtkapplication_x11.c
View file

@ -34,13 +34,12 @@ void gtk_application_cleanup ()
} }
void void
gtk_application_set_menu_bar (GtkMenuShell *menu_shell) gtk_application_set_menu_bar (GtkMenuShell* menushell)
{ {
} }
void void
gtk_application_add_app_menu_item (GtkApplicationMenuGroup *group, gtk_application_add_app_menu_item (GtkApplicationMenuGroup* group, GtkMenuItem* item)
GtkMenuItem *menu_item)
{ {
} }

7
libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h
View file

@ -20,13 +20,6 @@
#ifndef __gtkmm2ext_cell_renderer_pixbuf_multi_h__ #ifndef __gtkmm2ext_cell_renderer_pixbuf_multi_h__
#define __gtkmm2ext_cell_renderer_pixbuf_multi_h__ #define __gtkmm2ext_cell_renderer_pixbuf_multi_h__
#ifdef GTKOSX
#include <MacTypes.h>
#if defined(Style)
#undef style
#endif
#endif
#include <map> #include <map>
#include <stdint.h> #include <stdint.h>

7
libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h
View file

@ -17,13 +17,6 @@
*/ */
#ifdef GTKOSX
#include <MacTypes.h>
#if defined(Style)
#undef style
#endif
#endif
#ifndef __gtkmm2ext_cell_renderer_pixbuf_toggle_h__ #ifndef __gtkmm2ext_cell_renderer_pixbuf_toggle_h__
#define __gtkmm2ext_cell_renderer_pixbuf_toggle_h__ #define __gtkmm2ext_cell_renderer_pixbuf_toggle_h__

6
libs/gtkmm2ext/gtkmm2ext/dndvbox.h
View file

@ -283,7 +283,7 @@ private:
} }
/* Draw the drag icon */ /* Draw the drag icon */
bool icon_expose (GdkEventExpose* ev) bool icon_expose (GdkEventExpose*)
{ {
/* Just grab the child's widget and use that */ /* Just grab the child's widget and use that */
@ -307,7 +307,7 @@ private:
} }
void drag_data_received ( void drag_data_received (
Glib::RefPtr<Gdk::DragContext> const & context, int x, int y, Gtk::SelectionData const & selection_data, guint /*info*/, guint time Glib::RefPtr<Gdk::DragContext> const & context, int /*x*/, int y, Gtk::SelectionData const & selection_data, guint /*info*/, guint time
) )
{ {
/* work out where it was dropped */ /* work out where it was dropped */
@ -374,7 +374,7 @@ private:
} }
} }
bool drag_motion (Glib::RefPtr<Gdk::DragContext> const &, int x, int y, guint) bool drag_motion (Glib::RefPtr<Gdk::DragContext> const &, int /*x*/, int y, guint)
{ {
if (_children.empty ()) { if (_children.empty ()) {
return false; return false;

2
libs/gtkmm2ext/keyboard.cc
View file

@ -69,7 +69,7 @@ const char* Keyboard::primary_modifier_name() { return _("Command"); }
const char* Keyboard::secondary_modifier_name() { return _("Option"); } const char* Keyboard::secondary_modifier_name() { return _("Option"); }
const char* Keyboard::tertiary_modifier_name() { return _("Shift"); } const char* Keyboard::tertiary_modifier_name() { return _("Shift"); }
const char* Keyboard::level4_modifier_name() { return _("Control"); } const char* Keyboard::level4_modifier_name() { return _("Control"); }
const char* Keyboard::copy_modifier_name() { return _("Mod1"; ); } const char* Keyboard::copy_modifier_name() { return _("Mod1"); }
const char* Keyboard::rangeselect_modifier_name() { return _("Shift"); } const char* Keyboard::rangeselect_modifier_name() { return _("Shift"); }
#else #else

6
libs/gtkmm2ext/motionfeedback.cc
View file

@ -253,14 +253,14 @@ MotionFeedback::pixwin_motion_notify_event (GdkEventMotion *ev)
} }
bool bool
MotionFeedback::pixwin_enter_notify_event (GdkEventCrossing *ev) MotionFeedback::pixwin_enter_notify_event (GdkEventCrossing*)
{ {
pixwin.grab_focus(); pixwin.grab_focus();
return false; return false;
} }
bool bool
MotionFeedback::pixwin_leave_notify_event (GdkEventCrossing *ev) MotionFeedback::pixwin_leave_notify_event (GdkEventCrossing*)
{ {
pixwin.unset_flags (HAS_FOCUS); pixwin.unset_flags (HAS_FOCUS);
return false; return false;
@ -316,7 +316,7 @@ MotionFeedback::pixwin_key_press_event (GdkEventKey *ev)
} }
bool bool
MotionFeedback::pixwin_expose_event (GdkEventExpose* ev) MotionFeedback::pixwin_expose_event (GdkEventExpose*)
{ {
if (!_controllable) { if (!_controllable) {
return true; return true;

4
libs/gtkmm2ext/treeutils.cc
View file

@ -25,8 +25,8 @@ using namespace Glib;
using namespace Gtk; using namespace Gtk;
void void
Gtkmm2ext::treeview_select_one (RefPtr<TreeSelection> selection, RefPtr<TreeModel> model, TreeView& view, Gtkmm2ext::treeview_select_one (RefPtr<TreeSelection> selection, RefPtr<TreeModel> /*model*/, TreeView& view,
TreeIter iter, TreePath path, TreeViewColumn* col) TreeIter /*iter*/, TreePath path, TreeViewColumn* col)
{ {
if (!view.row_expanded (path)) { if (!view.row_expanded (path)) {
// cerr << "!! selecting a row that isn't expanded! " << path.to_string() << endl; // cerr << "!! selecting a row that isn't expanded! " << path.to_string() << endl;

5
libs/midi++2/midi++/names.h
View file

@ -220,8 +220,11 @@ inline static const char* midi_name(uint8_t status)
case MIDI_CTL_POLY: case MIDI_CTL_POLY:
return "Polyphonic Mode"; break; return "Polyphonic Mode"; break;
default: default:
return "Unnamed"; break; break;
} }
return "Unnamed";
} }
#endif /* __midinames_h__ */ #endif /* __midinames_h__ */

8
libs/panners/vbap/vbap.cc
View file

@ -33,7 +33,7 @@ static PanPluginDescriptor _descriptor = {
extern "C" { PanPluginDescriptor* panner_descriptor () { return &_descriptor; } } extern "C" { PanPluginDescriptor* panner_descriptor () { return &_descriptor; } }
VBAPanner::Signal::Signal (Session& session, VBAPanner& p, uint32_t n, uint32_t n_speakers) VBAPanner::Signal::Signal (Session&, VBAPanner&, uint32_t, uint32_t n_speakers)
{ {
resize_gains (n_speakers); resize_gains (n_speakers);
@ -363,9 +363,11 @@ VBAPanner::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co
} }
void void
VBAPanner::distribute_one_automated (AudioBuffer& src, BufferSet& obufs, VBAPanner::distribute_one_automated (AudioBuffer& /*src*/, BufferSet& /*obufs*/,
framepos_t start, framepos_t end, pframes_t nframes, pan_t** buffers, uint32_t which) framepos_t /*start*/, framepos_t /*end*/,
pframes_t /*nframes*/, pan_t** /*buffers*/, uint32_t /*which*/)
{ {
/* XXX to be implemented */
} }
XMLNode& XMLNode&

16
libs/pbd/boost_debug.cc
View file

@ -328,35 +328,35 @@ boost_debug_list_ptrs ()
namespace boost { namespace boost {
void sp_scalar_constructor_hook( void * object, std::size_t size, void * pn ) void sp_scalar_constructor_hook( void *, std::size_t, void *)
{ {
} }
void sp_scalar_destructor_hook( void * object, std::size_t size, void * pn ) void sp_scalar_destructor_hook( void *, std::size_t, void *)
{ {
} }
void sp_counter_ref_hook (void* pn, long use_count) void sp_counter_ref_hook (void* /*pn*/, long /* use count */)
{ {
} }
void sp_counter_release_hook (void* pn, long use_count) void sp_counter_release_hook (void* /*pn*/, long /*use_count*/)
{ {
} }
void sp_array_constructor_hook(void * p) void sp_array_constructor_hook(void *)
{ {
} }
void sp_array_destructor_hook(void * p) void sp_array_destructor_hook(void *)
{ {
} }
void sp_scalar_constructor_hook(void * p) void sp_scalar_constructor_hook(void *)
{ {
} }
void sp_scalar_destructor_hook(void * p) void sp_scalar_destructor_hook(void *)
{ {
} }

4
libs/qm-dsp/dsp/onsets/DetectionFunction.cpp
View file

@ -100,12 +100,12 @@ double DetectionFunction::process( const double *TDomain )
// data directly), we will have to use the next smallest power of // data directly), we will have to use the next smallest power of
// two from the block size. Results may vary accordingly! // two from the block size. Results may vary accordingly!
int actualLength = MathUtilities::previousPowerOfTwo(m_dataLength); unsigned int actualLength = MathUtilities::previousPowerOfTwo(m_dataLength);
if (actualLength != m_dataLength) { if (actualLength != m_dataLength) {
// Pre-fill mag and phase vectors with zero, as the FFT output // Pre-fill mag and phase vectors with zero, as the FFT output
// will not fill the arrays // will not fill the arrays
for (int i = actualLength/2; i < m_dataLength/2; ++i) { for (unsigned int i = actualLength/2; i < m_dataLength/2; ++i) {
m_magnitude[i] = 0; m_magnitude[i] = 0;
m_thetaAngle[0] = 0; m_thetaAngle[0] = 0;
} }

5
libs/qm-dsp/dsp/onsets/PeakPicking.cpp
View file

@ -80,7 +80,7 @@ void PeakPicking::process( double* src, unsigned int len, vector<int> &onsets )
quadEval( m_maxima, onsets ); quadEval( m_maxima, onsets );
for( int b = 0; b < m_maxima.size(); b++) for(unsigned int b = 0; b < m_maxima.size(); b++)
{ {
src[ b ] = m_maxima[ b ]; src[ b ] = m_maxima[ b ];
} }
@ -131,11 +131,8 @@ int PeakPicking::quadEval( vector<double> &src, vector<int> &idx )
p = TPolyFit::PolyFit2( m_err, m_maxFit, m_poly); p = TPolyFit::PolyFit2( m_err, m_maxFit, m_poly);
double f = m_poly[0]; double f = m_poly[0];
double g = m_poly[1];
double h = m_poly[2]; double h = m_poly[2];
int kk = m_poly.size();
if (h < -Qfilta || f > Qfiltc) if (h < -Qfilta || f > Qfiltc)
{ {
idx.push_back(m_maxIndex[j]); idx.push_back(m_maxIndex[j]);

2
libs/qm-dsp/dsp/signalconditioning/DFProcess.cpp
View file

@ -180,7 +180,7 @@ void DFProcess::removeDCNormalize( double *src, double*dst )
MathUtilities::getAlphaNorm( src, m_length, m_alphaNormParam, &DFAlphaNorm ); MathUtilities::getAlphaNorm( src, m_length, m_alphaNormParam, &DFAlphaNorm );
for( unsigned int i = 0; i< m_length; i++) for(int i = 0; i< m_length; i++)
{ {
dst[ i ] = ( src[ i ] - DFMin ) / DFAlphaNorm; dst[ i ] = ( src[ i ] - DFMin ) / DFAlphaNorm;
} }

2
libs/qm-dsp/dsp/wavelet/Wavelet.cpp
View file

@ -77,7 +77,7 @@ Wavelet::createDecompositionFilters(Type wavelet,
lpd.clear(); lpd.clear();
hpd.clear(); hpd.clear();
int flength = 0; unsigned int flength = 0;
switch (wavelet) { switch (wavelet) {

2
libs/qm-dsp/maths/CosineDistance.cpp
View file

@ -34,7 +34,7 @@ double CosineDistance::distance(const vector<double> &v1,
} }
else else
{ {
for(int i=0; i<v1.size(); i++) for(unsigned int i=0; i<v1.size(); i++)
{ {
dSum1 += v1[i]*v2[i]; dSum1 += v1[i]*v2[i];
dDen1 += v1[i]*v1[i]; dDen1 += v1[i]*v1[i];

11
libs/qm-dsp/maths/MathUtilities.cpp
View file

@ -155,7 +155,7 @@ double MathUtilities::mean(const std::vector<double> &src,
{ {
double sum = 0.; double sum = 0.;
for (int i = 0; i < count; ++i) for (unsigned int i = 0; i < count; ++i)
{ {
sum += src[start + i]; sum += src[start + i];
} }
@ -167,7 +167,6 @@ void MathUtilities::getFrameMinMax(const double *data, unsigned int len, double
{ {
unsigned int i; unsigned int i;
double temp = 0.0; double temp = 0.0;
double a=0.0;
if (len == 0) { if (len == 0) {
*min = *max = 0; *min = *max = 0;
@ -317,9 +316,9 @@ void MathUtilities::normalise(std::vector<double> &data, NormaliseType type)
case NormaliseUnitSum: case NormaliseUnitSum:
{ {
double sum = 0.0; double sum = 0.0;
for (int i = 0; i < data.size(); ++i) sum += data[i]; for (unsigned int i = 0; i < data.size(); ++i) sum += data[i];
if (sum != 0.0) { if (sum != 0.0) {
for (int i = 0; i < data.size(); ++i) data[i] /= sum; for (unsigned int i = 0; i < data.size(); ++i) data[i] /= sum;
} }
} }
break; break;
@ -327,11 +326,11 @@ void MathUtilities::normalise(std::vector<double> &data, NormaliseType type)
case NormaliseUnitMax: case NormaliseUnitMax:
{ {
double max = 0.0; double max = 0.0;
for (int i = 0; i < data.size(); ++i) { for (unsigned int i = 0; i < data.size(); ++i) {
if (fabs(data[i]) > max) max = fabs(data[i]); if (fabs(data[i]) > max) max = fabs(data[i]);
} }
if (max != 0.0) { if (max != 0.0) {
for (int i = 0; i < data.size(); ++i) data[i] /= max; for (unsigned int i = 0; i < data.size(); ++i) data[i] /= max;
} }
} }
break; break;

9
libs/qm-dsp/maths/Polyfit.h
View file

@ -105,13 +105,13 @@ double TPolyFit::PolyFit2 (const vector<double> &x,
// nterms = coefs.size() // nterms = coefs.size()
// npoints = x.size() // npoints = x.size()
{ {
int i, j; unsigned int i, j;
double xi, yi, yc, srs, sum_y, sum_y2; double xi, yi, yc, srs, sum_y, sum_y2;
Matrix xmatr; // Data matrix Matrix xmatr; // Data matrix
Matrix a; Matrix a;
vector<double> g; // Constant vector vector<double> g; // Constant vector
const int npoints(x.size()); const unsigned int npoints(x.size());
const int nterms(coefs.size()); const unsigned int nterms(coefs.size());
double correl_coef; double correl_coef;
zeroise(g, nterms); zeroise(g, nterms);
zeroise(a, nterms, nterms); zeroise(a, nterms, nterms);
@ -278,7 +278,8 @@ bool TPolyFit::GaussJordan2(Matrix &b,
double big, t; double big, t;
double pivot; double pivot;
double determ; double determ;
int irow, icol; int irow = 0;
int icol = 0;
int ncol(b.size()); int ncol(b.size());
int nv = 1; // single constant vector int nv = 1; // single constant vector
for(int i = 0; i < ncol; ++i) for(int i = 0; i < ncol; ++i)

2
libs/rubberband/src/StretcherProcess.cpp
View file

@ -200,6 +200,7 @@ RubberBandStretcher::Impl::processChunks(size_t c, bool &any, bool &last)
if (!cd.draining) { if (!cd.draining) {
size_t got = cd.inbuf->peek(cd.fltbuf, m_windowSize); size_t got = cd.inbuf->peek(cd.fltbuf, m_windowSize);
assert(got == m_windowSize || cd.inputSize >= 0); assert(got == m_windowSize || cd.inputSize >= 0);
got = 0;
cd.inbuf->skip(m_increment); cd.inbuf->skip(m_increment);
analyseChunk(c); analyseChunk(c);
} }
@ -230,6 +231,7 @@ RubberBandStretcher::Impl::processOneChunk()
ChannelData &cd = *m_channelData[c]; ChannelData &cd = *m_channelData[c];
if (!cd.draining) { if (!cd.draining) {
size_t got = cd.inbuf->peek(cd.fltbuf, m_windowSize); size_t got = cd.inbuf->peek(cd.fltbuf, m_windowSize);
got = 0;
assert(got == m_windowSize || cd.inputSize >= 0); assert(got == m_windowSize || cd.inputSize >= 0);
cd.inbuf->skip(m_increment); cd.inbuf->skip(m_increment);
analyseChunk(c); analyseChunk(c);

1
libs/surfaces/generic_midi/midicontrollable.cc
View file

@ -17,7 +17,6 @@
*/ */
#define __STDC_FORMAT_MACROS 1
#include <stdint.h> #include <stdint.h>
#include <cmath> #include <cmath>
#include <climits> #include <climits>

2
libs/surfaces/osc/osc.cc
View file

@ -576,7 +576,7 @@ OSC::_catchall (const char *path, const char *types, lo_arg **argv, int argc, vo
} }
int int
OSC::catchall (const char *path, const char *types, lo_arg **argv, int argc, lo_message msg) OSC::catchall (const char *path, const char* /*types*/, lo_arg **argv, int argc, lo_message msg)
{ {
size_t len; size_t len;
int ret = 1; /* unhandled */ int ret = 1; /* unhandled */

6
libs/surfaces/osc/osc.h
View file

@ -124,7 +124,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
} \ } \
int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *data) { \ int cb_ ## name (const char *, const char *, lo_arg **, int, void *data) { \
name (data); \ name (data); \
return 0; \ return 0; \
} }
@ -188,7 +188,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
} \ } \
int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \ int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *data) { \
if (argc > 1) { \ if (argc > 1) { \
name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type); \ name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type); \
} \ } \
@ -199,7 +199,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \ static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \ return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
} \ } \
int cb_ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data) { \ int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *data) { \
if (argc > 1) { \ if (argc > 1) { \
name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type,argv[3]->arg4type); \ name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type,argv[3]->arg4type); \
} \ } \

1
libs/taglib/taglib/fileref.h
View file

@ -108,6 +108,7 @@ namespace TagLib {
bool readAudioProperties = true, bool readAudioProperties = true,
AudioProperties::ReadStyle AudioProperties::ReadStyle
audioPropertiesStyle = AudioProperties::Average) const = 0; audioPropertiesStyle = AudioProperties::Average) const = 0;
virtual ~FileTypeResolver() {}
}; };
/*! /*!

1
libs/taglib/taglib/mpeg/id3v1/id3v1tag.h
View file

@ -78,6 +78,7 @@ namespace TagLib {
* ISO-8859-1. * ISO-8859-1.
*/ */
virtual ByteVector render(const String &s) const; virtual ByteVector render(const String &s) const;
virtual ~StringHandler() {}
}; };
//! The main class in the ID3v1 implementation //! The main class in the ID3v1 implementation

2
libs/vamp-sdk/src/vamp-sdk/PluginAdapter.cpp
View file

@ -588,7 +588,7 @@ PluginAdapterBase::Impl::vampGetRemainingFeatures(VampPluginHandle handle)
} }
void void
PluginAdapterBase::Impl::vampReleaseFeatureSet(VampFeatureList *fs) PluginAdapterBase::Impl::vampReleaseFeatureSet(VampFeatureList *)
{ {
#ifdef DEBUG_PLUGIN_ADAPTER #ifdef DEBUG_PLUGIN_ADAPTER
std::cerr << "PluginAdapterBase::Impl::vampReleaseFeatureSet" << std::endl; std::cerr << "PluginAdapterBase::Impl::vampReleaseFeatureSet" << std::endl;