diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-09-30 17:55:14 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-09-30 17:55:14 +0000 |
commit | 0938a42440cc82ce8d0cb064840c258c863714ab (patch) | |
tree | 19f58c31e65226d85c76d96647a6e300f7995c10 /libs | |
parent | 15e390ebe5611b5443eb1fb57631826389ffd021 (diff) |
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
Diffstat (limited to 'libs')
70 files changed, 189 insertions, 176 deletions
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<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 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<const std::string, const float> ScalePoints; - virtual boost::shared_ptr<ScalePoints> - get_scale_points(uint32_t port_index) const { + virtual boost::shared_ptr<ScalePoints> get_scale_points(uint32_t /*port_index*/) const { return boost::shared_ptr<ScalePoints>(); } 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<string> 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<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) , 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<framepos_t>& dst, - framepos_t position, + framepos_t /*position*/, framepos_t start, framecnt_t cnt, - MidiStateTracker* tracker) const + MidiStateTracker*) const { 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 MidiPlaylistSource::write_unlocked (MidiRingBuffer<framepos_t>& 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<Evoral::Musi } 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; /*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<Region> r, Progress* progress) +MidiStretch::run (boost::shared_ptr<Region> 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<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) , _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<Route> rt, bool others_on) +Session::set_exclusive_input_active (boost::shared_ptr<Route> rt, bool /*others_on*/) { RouteList rl; vector<string> 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<T> 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<typename Time> void Sequence<Time>::dump (ostream& str) const { - Sequence<Time>::const_iterator i; + typename Sequence<Time>::const_iterator i; str << "+++ dump\n"; for (i = begin(); i != end(); ++i) { str << *i << endl; diff --git a/libs/evoral/src/libsmf/smf_load.c b/libs/evoral/src/libsmf/smf_load.c index 060dc5849e..90a22509b5 100644 --- a/libs/evoral/src/libsmf/smf_load.c +++ b/libs/evoral/src/libsmf/smf_load.c @@ -275,7 +275,8 @@ is_escape_byte(const unsigned char status) static int32_t 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); @@ -424,7 +425,8 @@ extract_escaped_event(const unsigned char *buf, const size_t buffer_length, smf_ (void) last_status; int status; - int32_t message_length, vlq_length; + int32_t message_length = 0; + int32_t vlq_length = 0; const unsigned char *c = buf; status = *buf; @@ -645,7 +647,8 @@ smf_event_is_textual(const smf_event_t *event) char * 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)) return (NULL); diff --git a/libs/evoral/src/libsmf/smf_save.c b/libs/evoral/src/libsmf/smf_save.c index b99af75461..0540232707 100644 --- a/libs/evoral/src/libsmf/smf_save.c +++ b/libs/evoral/src/libsmf/smf_save.c @@ -180,6 +180,7 @@ smf_format_vlq(unsigned char *buf, int length, unsigned long value) } 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. */ return (i + 1); diff --git a/libs/gnomecanvas/libgnomecanvas/gnome-canvas-bpath.c b/libs/gnomecanvas/libgnomecanvas/gnome-canvas-bpath.c index f7f564a94d..d67595225d 100644 --- a/libs/gnomecanvas/libgnomecanvas/gnome-canvas-bpath.c +++ b/libs/gnomecanvas/libgnomecanvas/gnome-canvas-bpath.c @@ -108,7 +108,7 @@ gnome_canvas_bpath_class_init (GnomeCanvasBpathClass *class) } static void -gnome_canvas_bpath_init (GnomeCanvasBpath *bpath) +gnome_canvas_bpath_init (GnomeCanvasBpath* bpath) { } diff --git a/libs/gnomecanvas/libgnomecanvas/gnome-canvas-line.c b/libs/gnomecanvas/libgnomecanvas/gnome-canvas-line.c index b35a418072..8c1a6e9cc7 100644 --- a/libs/gnomecanvas/libgnomecanvas/gnome-canvas-line.c +++ b/libs/gnomecanvas/libgnomecanvas/gnome-canvas-line.c @@ -1125,7 +1125,7 @@ gnome_canvas_line_unrealize (GnomeCanvasItem *item) } static void -item_to_canvas (GnomeCanvas *canvas, double *item_coords, GdkPoint *canvas_coords, int num_points, +item_to_canvas (GnomeCanvas * canvas, double *item_coords, GdkPoint *canvas_coords, int num_points, int *num_drawn_points, double i2c[6], int x, int y) { int i; diff --git a/libs/gnomecanvas/libgnomecanvas/gnome-canvas-rich-text.c b/libs/gnomecanvas/libgnomecanvas/gnome-canvas-rich-text.c index 2a50f2ed4d..cf7c5290e0 100644 --- a/libs/gnomecanvas/libgnomecanvas/gnome-canvas-rich-text.c +++ b/libs/gnomecanvas/libgnomecanvas/gnome-canvas-rich-text.c @@ -806,15 +806,15 @@ gnome_canvas_rich_text_move_cursor(GnomeCanvasRichText *text, } /* gnome_canvas_rich_text_move_cursor */ static gboolean -whitespace(gunichar ch, gpointer user_data) +whitespace(gunichar ch, gpointer ignored) { return (ch == ' ' || ch == '\t'); } /* whitespace */ 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 */ static gboolean @@ -911,7 +911,7 @@ gnome_canvas_rich_text_delete_from_cursor(GnomeCanvasRichText *text, static gint selection_motion_event_handler(GnomeCanvasRichText *text, GdkEvent *event, - gpointer data) + gpointer ignored) { GtkTextIter newplace; GtkTextMark *mark; @@ -936,7 +936,7 @@ selection_motion_event_handler(GnomeCanvasRichText *text, GdkEvent *event, static void gnome_canvas_rich_text_start_selection_drag(GnomeCanvasRichText *text, const GtkTextIter *iter, - GdkEventButton *button) + GdkEventButton * button) { GtkTextIter newplace; @@ -958,7 +958,7 @@ gnome_canvas_rich_text_start_selection_drag(GnomeCanvasRichText *text, static gboolean gnome_canvas_rich_text_end_selection_drag(GnomeCanvasRichText *text, - GdkEventButton *event) + GdkEventButton * event) { if (text->_priv->selection_drag_handler == 0) return FALSE; @@ -1216,7 +1216,7 @@ gnome_canvas_rich_text_key_press_event(GnomeCanvasItem *item, } /* gnome_canvas_rich_text_key_press_event */ static gint -gnome_canvas_rich_text_key_release_event(GnomeCanvasItem *item, +gnome_canvas_rich_text_key_release_event(GnomeCanvasItem * item, GdkEventKey *event) { return FALSE; @@ -1403,7 +1403,7 @@ gnome_canvas_rich_text_button_release_event(GnomeCanvasItem *item, static gint gnome_canvas_rich_text_focus_in_event(GnomeCanvasItem *item, - GdkEventFocus *event) + GdkEventFocus * event) { GnomeCanvasRichText *text = GNOME_CANVAS_RICH_TEXT(item); @@ -1417,7 +1417,7 @@ gnome_canvas_rich_text_focus_in_event(GnomeCanvasItem *item, static gint gnome_canvas_rich_text_focus_out_event(GnomeCanvasItem *item, - GdkEventFocus *event) + GdkEventFocus * event) { GnomeCanvasRichText *text = GNOME_CANVAS_RICH_TEXT(item); @@ -1685,7 +1685,7 @@ request_update(gpointer data) } /* request_update */ static void -invalidated_handler(GtkTextLayout *layout, gpointer data) +invalidated_handler(GtkTextLayout * layout, gpointer data) { GnomeCanvasRichText *text = GNOME_CANVAS_RICH_TEXT(data); @@ -1714,7 +1714,7 @@ scale_fonts(GtkTextTag *tag, gpointer data) } /* scale_fonts */ static void -changed_handler(GtkTextLayout *layout, gint start_y, +changed_handler(GtkTextLayout * layout, gint start_y, gint old_height, gint new_height, gpointer data) { GnomeCanvasRichText *text = GNOME_CANVAS_RICH_TEXT(data); @@ -1864,7 +1864,7 @@ gnome_canvas_rich_text_get_iter_at_location (GnomeCanvasRichText *text, static void -gnome_canvas_rich_text_set_attributes_from_style(GnomeCanvasRichText *text, +gnome_canvas_rich_text_set_attributes_from_style(GnomeCanvasRichText * text, GtkTextAttributes *values, GtkStyle *style) { diff --git a/libs/gnomecanvas/libgnomecanvas/gnome-canvas-widget.c b/libs/gnomecanvas/libgnomecanvas/gnome-canvas-widget.c index d94942c8a5..6ac14365d3 100644 --- a/libs/gnomecanvas/libgnomecanvas/gnome-canvas-widget.c +++ b/libs/gnomecanvas/libgnomecanvas/gnome-canvas-widget.c @@ -365,7 +365,7 @@ gnome_canvas_widget_set_property (GObject *object, break; 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); update = TRUE; @@ -469,8 +469,8 @@ gnome_canvas_widget_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_ } static void -gnome_canvas_widget_render (GnomeCanvasItem *item, - GnomeCanvasBuf *buf) +gnome_canvas_widget_render (GnomeCanvasItem * item, + GnomeCanvasBuf * buf) { #if 0 GnomeCanvasWidget *witem; @@ -484,8 +484,8 @@ gnome_canvas_widget_render (GnomeCanvasItem *item, } static void -gnome_canvas_widget_draw (GnomeCanvasItem *item, - GdkDrawable *drawable, +gnome_canvas_widget_draw (GnomeCanvasItem * item, + GdkDrawable * drawable, int x, int y, int width, int height) { diff --git a/libs/gnomecanvas/libgnomecanvas/gnome-canvas.c b/libs/gnomecanvas/libgnomecanvas/gnome-canvas.c index ae93b1e311..9813f5d33f 100644 --- a/libs/gnomecanvas/libgnomecanvas/gnome-canvas.c +++ b/libs/gnomecanvas/libgnomecanvas/gnome-canvas.c @@ -388,7 +388,7 @@ gnome_canvas_item_unmap (GnomeCanvasItem *item) /* Update handler for canvas items */ static void -gnome_canvas_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags) +gnome_canvas_item_update (GnomeCanvasItem *item, double *affine, ArtSVP * clip_path, int flags) { GTK_OBJECT_UNSET_FLAGS (item, GNOME_CANVAS_ITEM_NEED_UPDATE); GTK_OBJECT_UNSET_FLAGS (item, GNOME_CANVAS_ITEM_NEED_AFFINE); @@ -1423,7 +1423,7 @@ gnome_canvas_group_class_init (GnomeCanvasGroupClass *class) /* Object initialization function for GnomeCanvasGroup */ static void -gnome_canvas_group_init (GnomeCanvasGroup *group) +gnome_canvas_group_init (GnomeCanvasGroup * group) { #if 0 group->xpos = 0.0; diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc index 6002f16371..92004e4d27 100644 --- a/libs/gtkmm2ext/bindings.cc +++ b/libs/gtkmm2ext/bindings.cc @@ -217,7 +217,7 @@ Bindings::set_action_map (ActionMap& am) bool Bindings::activate (KeyboardKey kb, Operation op) { - KeybindingMap* kbm; + KeybindingMap* kbm = 0; switch (op) { case Press: @@ -244,7 +244,7 @@ Bindings::activate (KeyboardKey kb, Operation op) void Bindings::add (KeyboardKey kb, Operation op, RefPtr<Action> what) { - KeybindingMap* kbm; + KeybindingMap* kbm = 0; switch (op) { case Press: @@ -269,7 +269,7 @@ Bindings::add (KeyboardKey kb, Operation op, RefPtr<Action> what) void Bindings::remove (KeyboardKey kb, Operation op) { - KeybindingMap* kbm; + KeybindingMap* kbm = 0; switch (op) { case Press: @@ -290,7 +290,7 @@ Bindings::remove (KeyboardKey kb, Operation op) bool Bindings::activate (MouseButton bb, Operation op) { - MouseButtonBindingMap* bbm; + MouseButtonBindingMap* bbm = 0; switch (op) { case Press: @@ -317,7 +317,7 @@ Bindings::activate (MouseButton bb, Operation op) void Bindings::add (MouseButton bb, Operation op, RefPtr<Action> what) { - MouseButtonBindingMap* bbm; + MouseButtonBindingMap* bbm = 0; switch (op) { case Press: @@ -342,7 +342,7 @@ Bindings::add (MouseButton bb, Operation op, RefPtr<Action> what) void Bindings::remove (MouseButton bb, Operation op) { - MouseButtonBindingMap* bbm; + MouseButtonBindingMap* bbm = 0; switch (op) { case Press: diff --git a/libs/gtkmm2ext/cairocell.cc b/libs/gtkmm2ext/cairocell.cc index 5a7f4309ed..86dac26f2c 100644 --- a/libs/gtkmm2ext/cairocell.cc +++ b/libs/gtkmm2ext/cairocell.cc @@ -232,13 +232,13 @@ CairoEditableText::on_scroll_event (GdkEventScroll* ev) } bool -CairoEditableText::on_focus_in_event (GdkEventFocus* ev) +CairoEditableText::on_focus_in_event (GdkEventFocus*) { return false; } bool -CairoEditableText::on_focus_out_event (GdkEventFocus* ev) +CairoEditableText::on_focus_out_event (GdkEventFocus*) { if (editing_cell) { queue_draw_cell (editing_cell); diff --git a/libs/gtkmm2ext/gtkapplication_quartz.mm b/libs/gtkmm2ext/gtkapplication_quartz.mm index 694bfedd50..045db98a95 100644 --- a/libs/gtkmm2ext/gtkapplication_quartz.mm +++ b/libs/gtkmm2ext/gtkapplication_quartz.mm @@ -24,6 +24,15 @@ * 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/NSMenuItem.h> #import <AppKit/NSCell.h> @@ -32,12 +41,6 @@ #import <Foundation/NSString.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 DEBUG(format, ...) g_printerr ("%s: " format, G_STRFUNC, ## __VA_ARGS__) diff --git a/libs/gtkmm2ext/gtkapplication_x11.c b/libs/gtkmm2ext/gtkapplication_x11.c index dd16e36c09..8ab590fb54 100644 --- a/libs/gtkmm2ext/gtkapplication_x11.c +++ b/libs/gtkmm2ext/gtkapplication_x11.c @@ -34,13 +34,12 @@ void gtk_application_cleanup () } void -gtk_application_set_menu_bar (GtkMenuShell *menu_shell) +gtk_application_set_menu_bar (GtkMenuShell* menushell) { } void -gtk_application_add_app_menu_item (GtkApplicationMenuGroup *group, - GtkMenuItem *menu_item) +gtk_application_add_app_menu_item (GtkApplicationMenuGroup* group, GtkMenuItem* item) { } diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h index dfa81cffe0..c856414150 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h +++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h @@ -20,13 +20,6 @@ #ifndef __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 <stdint.h> diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h index 4a1bbb9051..7bc5d80685 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h +++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h @@ -17,13 +17,6 @@ */ -#ifdef GTKOSX -#include <MacTypes.h> -#if defined(Style) -#undef style -#endif -#endif - #ifndef __gtkmm2ext_cell_renderer_pixbuf_toggle_h__ #define __gtkmm2ext_cell_renderer_pixbuf_toggle_h__ diff --git a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h index e0b1c6ea13..649455e86b 100644 --- a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h +++ b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h @@ -283,7 +283,7 @@ private: } /* Draw the drag icon */ - bool icon_expose (GdkEventExpose* ev) + bool icon_expose (GdkEventExpose*) { /* Just grab the child's widget and use that */ @@ -307,7 +307,7 @@ private: } 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 */ @@ -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 ()) { return false; diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 20380d5b01..10c9723696 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -69,7 +69,7 @@ const char* Keyboard::primary_modifier_name() { return _("Command"); } const char* Keyboard::secondary_modifier_name() { return _("Option"); } const char* Keyboard::tertiary_modifier_name() { return _("Shift"); } 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"); } #else diff --git a/libs/gtkmm2ext/motionfeedback.cc b/libs/gtkmm2ext/motionfeedback.cc index c3152d7616..6b85913d0c 100644 --- a/libs/gtkmm2ext/motionfeedback.cc +++ b/libs/gtkmm2ext/motionfeedback.cc @@ -253,14 +253,14 @@ MotionFeedback::pixwin_motion_notify_event (GdkEventMotion *ev) } bool -MotionFeedback::pixwin_enter_notify_event (GdkEventCrossing *ev) +MotionFeedback::pixwin_enter_notify_event (GdkEventCrossing*) { pixwin.grab_focus(); return false; } bool -MotionFeedback::pixwin_leave_notify_event (GdkEventCrossing *ev) +MotionFeedback::pixwin_leave_notify_event (GdkEventCrossing*) { pixwin.unset_flags (HAS_FOCUS); return false; @@ -316,7 +316,7 @@ MotionFeedback::pixwin_key_press_event (GdkEventKey *ev) } bool -MotionFeedback::pixwin_expose_event (GdkEventExpose* ev) +MotionFeedback::pixwin_expose_event (GdkEventExpose*) { if (!_controllable) { return true; diff --git a/libs/gtkmm2ext/treeutils.cc b/libs/gtkmm2ext/treeutils.cc index 0ed8a9d5f9..d509ff6796 100644 --- a/libs/gtkmm2ext/treeutils.cc +++ b/libs/gtkmm2ext/treeutils.cc @@ -25,8 +25,8 @@ using namespace Glib; using namespace Gtk; void -Gtkmm2ext::treeview_select_one (RefPtr<TreeSelection> selection, RefPtr<TreeModel> model, TreeView& view, - TreeIter iter, TreePath path, TreeViewColumn* col) +Gtkmm2ext::treeview_select_one (RefPtr<TreeSelection> selection, RefPtr<TreeModel> /*model*/, TreeView& view, + TreeIter /*iter*/, TreePath path, TreeViewColumn* col) { if (!view.row_expanded (path)) { // cerr << "!! selecting a row that isn't expanded! " << path.to_string() << endl; diff --git a/libs/midi++2/midi++/names.h b/libs/midi++2/midi++/names.h index da83cdcb41..9597de3928 100644 --- a/libs/midi++2/midi++/names.h +++ b/libs/midi++2/midi++/names.h @@ -220,8 +220,11 @@ inline static const char* midi_name(uint8_t status) case MIDI_CTL_POLY: return "Polyphonic Mode"; break; default: - return "Unnamed"; break; + break; } + + return "Unnamed"; + } #endif /* __midinames_h__ */ diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc index d4a7030d9b..59f8cddb62 100644 --- a/libs/panners/vbap/vbap.cc +++ b/libs/panners/vbap/vbap.cc @@ -33,7 +33,7 @@ static PanPluginDescriptor _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); @@ -363,9 +363,11 @@ VBAPanner::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co } void -VBAPanner::distribute_one_automated (AudioBuffer& src, BufferSet& obufs, - framepos_t start, framepos_t end, pframes_t nframes, pan_t** buffers, uint32_t which) +VBAPanner::distribute_one_automated (AudioBuffer& /*src*/, BufferSet& /*obufs*/, + framepos_t /*start*/, framepos_t /*end*/, + pframes_t /*nframes*/, pan_t** /*buffers*/, uint32_t /*which*/) { + /* XXX to be implemented */ } XMLNode& diff --git a/libs/pbd/boost_debug.cc b/libs/pbd/boost_debug.cc index 9d307f64af..3ddbc88e6d 100644 --- a/libs/pbd/boost_debug.cc +++ b/libs/pbd/boost_debug.cc @@ -328,35 +328,35 @@ boost_debug_list_ptrs () 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 *) { } diff --git a/libs/qm-dsp/dsp/onsets/DetectionFunction.cpp b/libs/qm-dsp/dsp/onsets/DetectionFunction.cpp index 6ba1ad06ca..1abed021f9 100644 --- a/libs/qm-dsp/dsp/onsets/DetectionFunction.cpp +++ b/libs/qm-dsp/dsp/onsets/DetectionFunction.cpp @@ -100,12 +100,12 @@ double DetectionFunction::process( const double *TDomain ) // data directly), we will have to use the next smallest power of // 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) { // Pre-fill mag and phase vectors with zero, as the FFT output // 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_thetaAngle[0] = 0; } diff --git a/libs/qm-dsp/dsp/onsets/PeakPicking.cpp b/libs/qm-dsp/dsp/onsets/PeakPicking.cpp index 879ae8813c..55f56b46d0 100644 --- a/libs/qm-dsp/dsp/onsets/PeakPicking.cpp +++ b/libs/qm-dsp/dsp/onsets/PeakPicking.cpp @@ -80,7 +80,7 @@ void PeakPicking::process( double* src, unsigned int len, vector<int> &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 ]; } @@ -131,11 +131,8 @@ int PeakPicking::quadEval( vector<double> &src, vector<int> &idx ) p = TPolyFit::PolyFit2( m_err, m_maxFit, m_poly); double f = m_poly[0]; - double g = m_poly[1]; double h = m_poly[2]; - int kk = m_poly.size(); - if (h < -Qfilta || f > Qfiltc) { idx.push_back(m_maxIndex[j]); diff --git a/libs/qm-dsp/dsp/signalconditioning/DFProcess.cpp b/libs/qm-dsp/dsp/signalconditioning/DFProcess.cpp index bbe308b985..15c6d3ce36 100644 --- a/libs/qm-dsp/dsp/signalconditioning/DFProcess.cpp +++ b/libs/qm-dsp/dsp/signalconditioning/DFProcess.cpp @@ -180,7 +180,7 @@ void DFProcess::removeDCNormalize( double *src, double*dst ) 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; } diff --git a/libs/qm-dsp/dsp/wavelet/Wavelet.cpp b/libs/qm-dsp/dsp/wavelet/Wavelet.cpp index 764c84b24a..504090528c 100644 --- a/libs/qm-dsp/dsp/wavelet/Wavelet.cpp +++ b/libs/qm-dsp/dsp/wavelet/Wavelet.cpp @@ -77,7 +77,7 @@ Wavelet::createDecompositionFilters(Type wavelet, lpd.clear(); hpd.clear(); - int flength = 0; + unsigned int flength = 0; switch (wavelet) { diff --git a/libs/qm-dsp/maths/CosineDistance.cpp b/libs/qm-dsp/maths/CosineDistance.cpp index 13ab9ce0e8..fd2aeef3fe 100644 --- a/libs/qm-dsp/maths/CosineDistance.cpp +++ b/libs/qm-dsp/maths/CosineDistance.cpp @@ -34,7 +34,7 @@ double CosineDistance::distance(const vector<double> &v1, } else { - for(int i=0; i<v1.size(); i++) + for(unsigned int i=0; i<v1.size(); i++) { dSum1 += v1[i]*v2[i]; dDen1 += v1[i]*v1[i]; diff --git a/libs/qm-dsp/maths/MathUtilities.cpp b/libs/qm-dsp/maths/MathUtilities.cpp index 809874121e..70a275912c 100644 --- a/libs/qm-dsp/maths/MathUtilities.cpp +++ b/libs/qm-dsp/maths/MathUtilities.cpp @@ -155,7 +155,7 @@ double MathUtilities::mean(const std::vector<double> &src, { double sum = 0.; - for (int i = 0; i < count; ++i) + for (unsigned int i = 0; i < count; ++i) { sum += src[start + i]; } @@ -167,7 +167,6 @@ void MathUtilities::getFrameMinMax(const double *data, unsigned int len, double { unsigned int i; double temp = 0.0; - double a=0.0; if (len == 0) { *min = *max = 0; @@ -317,9 +316,9 @@ void MathUtilities::normalise(std::vector<double> &data, NormaliseType type) case NormaliseUnitSum: { 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) { - for (int i = 0; i < data.size(); ++i) data[i] /= sum; + for (unsigned int i = 0; i < data.size(); ++i) data[i] /= sum; } } break; @@ -327,11 +326,11 @@ void MathUtilities::normalise(std::vector<double> &data, NormaliseType type) case NormaliseUnitMax: { 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 (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; diff --git a/libs/qm-dsp/maths/Polyfit.h b/libs/qm-dsp/maths/Polyfit.h index 86bb64cb1e..3fac62d1b2 100644 --- a/libs/qm-dsp/maths/Polyfit.h +++ b/libs/qm-dsp/maths/Polyfit.h @@ -105,13 +105,13 @@ double TPolyFit::PolyFit2 (const vector<double> &x, // nterms = coefs.size() // npoints = x.size() { - int i, j; + unsigned int i, j; double xi, yi, yc, srs, sum_y, sum_y2; Matrix xmatr; // Data matrix Matrix a; vector<double> g; // Constant vector - const int npoints(x.size()); - const int nterms(coefs.size()); + const unsigned int npoints(x.size()); + const unsigned int nterms(coefs.size()); double correl_coef; zeroise(g, nterms); zeroise(a, nterms, nterms); @@ -278,7 +278,8 @@ bool TPolyFit::GaussJordan2(Matrix &b, double big, t; double pivot; double determ; - int irow, icol; + int irow = 0; + int icol = 0; int ncol(b.size()); int nv = 1; // single constant vector for(int i = 0; i < ncol; ++i) diff --git a/libs/rubberband/src/StretcherProcess.cpp b/libs/rubberband/src/StretcherProcess.cpp index 47bf77e197..3b832e09e1 100644 --- a/libs/rubberband/src/StretcherProcess.cpp +++ b/libs/rubberband/src/StretcherProcess.cpp @@ -200,6 +200,7 @@ RubberBandStretcher::Impl::processChunks(size_t c, bool &any, bool &last) if (!cd.draining) { size_t got = cd.inbuf->peek(cd.fltbuf, m_windowSize); assert(got == m_windowSize || cd.inputSize >= 0); + got = 0; cd.inbuf->skip(m_increment); analyseChunk(c); } @@ -230,6 +231,7 @@ RubberBandStretcher::Impl::processOneChunk() ChannelData &cd = *m_channelData[c]; if (!cd.draining) { size_t got = cd.inbuf->peek(cd.fltbuf, m_windowSize); + got = 0; assert(got == m_windowSize || cd.inputSize >= 0); cd.inbuf->skip(m_increment); analyseChunk(c); diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc index 426d730743..bae3201072 100644 --- a/libs/surfaces/generic_midi/midicontrollable.cc +++ b/libs/surfaces/generic_midi/midicontrollable.cc @@ -17,7 +17,6 @@ */ -#define __STDC_FORMAT_MACROS 1 #include <stdint.h> #include <cmath> #include <climits> diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 280959ae09..a76943156c 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -576,7 +576,7 @@ OSC::_catchall (const char *path, const char *types, lo_arg **argv, int argc, vo } 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; int ret = 1; /* unhandled */ diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 27c2e6ba03..4da22cf9e4 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -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) { \ 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); \ 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) { \ 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) { \ 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) { \ 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) { \ name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type,argv[3]->arg4type); \ } \ diff --git a/libs/taglib/taglib/fileref.h b/libs/taglib/taglib/fileref.h index cb4c2b41cc..706ddbae0d 100644 --- a/libs/taglib/taglib/fileref.h +++ b/libs/taglib/taglib/fileref.h @@ -108,6 +108,7 @@ namespace TagLib { bool readAudioProperties = true, AudioProperties::ReadStyle audioPropertiesStyle = AudioProperties::Average) const = 0; + virtual ~FileTypeResolver() {} }; /*! diff --git a/libs/taglib/taglib/mpeg/id3v1/id3v1tag.h b/libs/taglib/taglib/mpeg/id3v1/id3v1tag.h index 8dc60c3d23..a2372f8738 100644 --- a/libs/taglib/taglib/mpeg/id3v1/id3v1tag.h +++ b/libs/taglib/taglib/mpeg/id3v1/id3v1tag.h @@ -78,6 +78,7 @@ namespace TagLib { * ISO-8859-1. */ virtual ByteVector render(const String &s) const; + virtual ~StringHandler() {} }; //! The main class in the ID3v1 implementation diff --git a/libs/vamp-sdk/src/vamp-sdk/PluginAdapter.cpp b/libs/vamp-sdk/src/vamp-sdk/PluginAdapter.cpp index 5a4593dde8..c937ba67b7 100644 --- a/libs/vamp-sdk/src/vamp-sdk/PluginAdapter.cpp +++ b/libs/vamp-sdk/src/vamp-sdk/PluginAdapter.cpp @@ -588,7 +588,7 @@ PluginAdapterBase::Impl::vampGetRemainingFeatures(VampPluginHandle handle) } void -PluginAdapterBase::Impl::vampReleaseFeatureSet(VampFeatureList *fs) +PluginAdapterBase::Impl::vampReleaseFeatureSet(VampFeatureList *) { #ifdef DEBUG_PLUGIN_ADAPTER std::cerr << "PluginAdapterBase::Impl::vampReleaseFeatureSet" << std::endl; |