diff options
40 files changed, 61 insertions, 31 deletions
diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index ced1ba3a40..f25dc1c9b2 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -17,6 +17,7 @@ */ +#include <cstring> #include <vector> #include <string> #include <list> diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index 8483bab393..dfbdb30ffe 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -74,12 +74,13 @@ AutomationController::create(boost::shared_ptr<Automatable> parent, boost::share void AutomationController::update_label(char* label, int label_len) { - if (label && label_len) + if (label && label_len) { // Hack to display CC rounded to int if (_controllable->parameter().type() == MidiCCAutomation) snprintf(label, label_len, "%d", (int)_controllable->get_value()); else snprintf(label, label_len, "%.3f", _controllable->get_value()); + } } void diff --git a/gtk2_ardour/editing.cc b/gtk2_ardour/editing.cc index 963b83647c..2874e69308 100644 --- a/gtk2_ardour/editing.cc +++ b/gtk2_ardour/editing.cc @@ -18,6 +18,7 @@ */ #include <string> +#include <cstring> #include "editing.h" diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index dff2271a80..3d14d96178 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -3733,7 +3733,7 @@ Editor::get_valid_views (TimeAxisView* track, RouteGroup* group) v->push_back (*i); } - } else if (track != 0 && group == 0 || (track != 0 && group != 0 && !group->is_active())) { + } else if ((track != 0 && group == 0) || (track != 0 && group != 0 && !group->is_active())) { /* just the view for this track */ diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index e6c3ca972b..e1d320e386 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -518,7 +518,7 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it (mouse_mode != MouseTimeFX || item_type != RegionItem) && (mouse_mode != MouseRange)) || - (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE || event->button.button > 3)) { + ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3)) { return; } diff --git a/gtk2_ardour/fft_result.cc b/gtk2_ardour/fft_result.cc index d692b9152b..a9858542a3 100644 --- a/gtk2_ardour/fft_result.cc +++ b/gtk2_ardour/fft_result.cc @@ -21,6 +21,7 @@ #include <fft_result.h> #include <fft_graph.h> #include <cstdlib> +#include <cstring> #include <string> #include <cmath> diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index d1b5f74990..fb3d68fa14 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -289,11 +289,12 @@ MidiRegionView::canvas_event(GdkEvent* ev) if (_mouse_state == AddDragging) event_x = trackview.editor.frame_to_pixel(event_frame); - if (drag_rect) + if (drag_rect) { if (event_x > drag_start_x) drag_rect->property_x2() = event_x; else drag_rect->property_x1() = event_x; + } if (drag_rect && _mouse_state == SelectRectDragging) { if (event_y > drag_start_y) diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc index 22ddfa395d..4c128d4bf3 100644 --- a/gtk2_ardour/new_session_dialog.cc +++ b/gtk2_ardour/new_session_dialog.cc @@ -738,7 +738,7 @@ NewSessionDialog::which_page () const } else if (page_set == EnginePage) { return EnginePage; - } else if (page_set == NewPage|OpenPage) { + } else if (page_set == (NewPage|OpenPage)) { switch (num) { case 0: return NewPage; @@ -746,7 +746,7 @@ NewSessionDialog::which_page () const return OpenPage; } - } else if (page_set == NewPage|EnginePage) { + } else if (page_set == (NewPage|EnginePage)) { switch (num) { case 0: return NewPage; @@ -754,7 +754,7 @@ NewSessionDialog::which_page () const return EnginePage; } - } else if (page_set == NewPage|EnginePage|OpenPage) { + } else if (page_set == (NewPage|EnginePage|OpenPage)) { switch (num) { case 0: return NewPage; @@ -764,7 +764,7 @@ NewSessionDialog::which_page () const return EnginePage; } - } else if (page_set == OpenPage|EnginePage) { + } else if (page_set == (OpenPage|EnginePage)) { switch (num) { case 0: return OpenPage; @@ -772,6 +772,8 @@ NewSessionDialog::which_page () const return EnginePage; } } + + return NewPage; /* shouldn't get here */ } void diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 384e3e5538..1977858f0f 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -1229,7 +1229,7 @@ RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, nframes_t start_adjusted = session_frame_to_track_frame(start, speed); nframes_t end_adjusted = session_frame_to_track_frame(end, speed); - if (_view && ((top < 0.0 && bot < 0.0)) || touched (top, bot)) { + if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) { _view->get_selectables (start_adjusted, end_adjusted, results); } diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 6fa74e986c..b7b853ebec 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -399,11 +399,11 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S found_list (ListStore::create(found_list_columns)), freesound_list (ListStore::create(freesound_list_columns)), chooser (FILE_CHOOSER_ACTION_OPEN), - found_list_view (found_list), - freesound_list_view (freesound_list), preview (persistent), found_search_btn (_("Search")), - freesound_search_btn (_("Start Downloading")) + found_list_view (found_list), + freesound_search_btn (_("Start Downloading")), + freesound_list_view (freesound_list) { resetting_ourselves = false; diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc index ae540b86e8..a2ad70e8b1 100644 --- a/libs/ardour/amp.cc +++ b/libs/ardour/amp.cc @@ -16,10 +16,10 @@ 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ardour/amp.h> - -#include <algorithm> +#include <cstring> #include <cmath> +#include <algorithm> +#include <ardour/amp.h> #include <ardour/buffer_set.h> #include <ardour/audio_buffer.h> diff --git a/libs/ardour/ardour/audio_buffer.h b/libs/ardour/ardour/audio_buffer.h index 1f6c2f63bf..71eaf60ade 100644 --- a/libs/ardour/ardour/audio_buffer.h +++ b/libs/ardour/ardour/audio_buffer.h @@ -19,6 +19,7 @@ #ifndef __ardour_audio_buffer_h__ #define __ardour_audio_buffer_h__ +#include <cstring> #include <ardour/buffer.h> namespace ARDOUR { diff --git a/libs/ardour/ardour/silentfilesource.h b/libs/ardour/ardour/silentfilesource.h index 87065c1cd0..cbb123139a 100644 --- a/libs/ardour/ardour/silentfilesource.h +++ b/libs/ardour/ardour/silentfilesource.h @@ -20,6 +20,7 @@ #ifndef __ardour_silentfilesource_h__ #define __ardour_silentfilesource_h__ +#include <cstring> #include <ardour/audiofilesource.h> namespace ARDOUR { diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index 059fed8752..59e6007a6d 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -398,8 +398,8 @@ AudioDiskstream::check_record_status (nframes_t transport_frame, nframes_t nfram /* if per-track or global rec-enable turned on while the other was already on, we've started recording */ - if ((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record) || - ((change & global_rec_enabled) && can_record && (!(change & track_rec_enabled) && record_enabled()))) { + if (((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record)) || + (((change & global_rec_enabled) && can_record && (!(change & track_rec_enabled) && record_enabled())))) { /* starting to record: compute first+last frames */ diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc index eccc38434d..98c4206301 100644 --- a/libs/ardour/audioanalyser.cc +++ b/libs/ardour/audioanalyser.cc @@ -1,3 +1,4 @@ +#include <cstring> #include <vamp-sdk/hostext/PluginLoader.h> #include <glibmm/miscutils.h> #include <glibmm/fileutils.h> diff --git a/libs/ardour/automation_event.cc b/libs/ardour/automation_event.cc index a3edc9dcde..e01e349281 100644 --- a/libs/ardour/automation_event.cc +++ b/libs/ardour/automation_event.cc @@ -1210,7 +1210,7 @@ AutomationList::rt_safe_earliest_event_linear_unlocked (double start, double end x = first->when + (y - first->value) / (double)slope; - while ((inclusive && x < start) || x <= start && y != next->value) { + while ((inclusive && x < start) || (x <= start && y != next->value)) { if (first->value < next->value) // ramping up y += 1.0; diff --git a/libs/ardour/find_session.cc b/libs/ardour/find_session.cc index f8ed3d5a46..4388d8e299 100644 --- a/libs/ardour/find_session.cc +++ b/libs/ardour/find_session.cc @@ -1,6 +1,7 @@ #include <unistd.h> #include <sys/stat.h> +#include <cstring> #include <climits> #include <cerrno> diff --git a/libs/ardour/gdither.cc b/libs/ardour/gdither.cc index 7242f857c8..ac47a0a61e 100644 --- a/libs/ardour/gdither.cc +++ b/libs/ardour/gdither.cc @@ -387,7 +387,7 @@ void gdither_runf(GDither s, uint32_t channel, uint32_t length, } /* some common case handling code - looks a bit wierd, but it allows - * the compiler to optiomise out the branches in the inner loop */ + * the compiler to optimise out the branches in the inner loop */ if (s->bit_depth == 8 && s->dither_depth == 8) { switch (s->type) { case GDitherNone: @@ -411,7 +411,7 @@ void gdither_runf(GDither s, uint32_t channel, uint32_t length, ss, x, y, MAX_U8, MIN_U8); break; } - } else if (s->bit_depth == s->dither_depth == 16) { + } else if (s->bit_depth == 16 && s->dither_depth == 16) { switch (s->type) { case GDitherNone: gdither_innner_loop(GDitherNone, s->channels, 0.0f, SCALE_S16, diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 885435e238..2e1647f507 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -339,7 +339,7 @@ MidiDiskstream::check_record_status (nframes_t transport_frame, nframes_t nframe /* if per-track or global rec-enable turned on while the other was already on, we've started recording */ - if ((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record) || + if (((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record)) || ((change & global_rec_enabled) && can_record && (!(change & track_rec_enabled) && record_enabled()))) { /* starting to record: compute first+last frames */ @@ -909,7 +909,7 @@ MidiDiskstream::do_flush (Session::RunContext context, bool force_flush) total = _session.transport_frame() - _last_flush_frame; - if (total == 0 || _capture_buf->read_space() == 0 && _session.transport_speed() == 0 || (total < disk_io_chunk_frames && !force_flush && was_recording)) { + if (total == 0 || (_capture_buf->read_space() == 0 && _session.transport_speed() == 0) || (total < disk_io_chunk_frames && !force_flush && was_recording)) { goto out; } diff --git a/libs/ardour/recent_sessions.cc b/libs/ardour/recent_sessions.cc index ebc5499f89..9b8668dd88 100644 --- a/libs/ardour/recent_sessions.cc +++ b/libs/ardour/recent_sessions.cc @@ -17,6 +17,7 @@ */ +#include <cstring> #include <cerrno> #include <unistd.h> #include <fstream> diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 8357b7e901..ff269cc931 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -134,8 +134,8 @@ Session::Session (AudioEngine &eng, _session_dir (new SessionDirectory(fullpath)), pending_events (2048), post_transport_work((PostTransportWork)0), - midi_requests (128), _send_smpte_update (false), + midi_requests (128), diskstreams (new DiskstreamList), routes (new RouteList), auditioner ((Auditioner*) 0), @@ -204,8 +204,8 @@ Session::Session (AudioEngine &eng, _session_dir ( new SessionDirectory(fullpath)), pending_events (2048), post_transport_work((PostTransportWork)0), - midi_requests (16), _send_smpte_update (false), + midi_requests (16), diskstreams (new DiskstreamList), routes (new RouteList), _bundle_xml_node (0), diff --git a/libs/ardour/smf_reader.cc b/libs/ardour/smf_reader.cc index 63a020f141..c5e715c2ce 100644 --- a/libs/ardour/smf_reader.cc +++ b/libs/ardour/smf_reader.cc @@ -17,6 +17,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <cstring> #include <cstdio> #include <cassert> #include <iostream> diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index e534964343..ab090381b4 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -17,6 +17,7 @@ */ +#include <cstring> #include <cerrno> #include <climits> diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc index 50b9ff320e..f30f568f9d 100644 --- a/libs/ardour/utils.cc +++ b/libs/ardour/utils.cc @@ -21,6 +21,7 @@ #include <stdint.h> #include <cstdio> /* for sprintf */ +#include <cstring> #include <cmath> #include <cctype> #include <string> diff --git a/libs/clearlooks/clearlooks_style.c b/libs/clearlooks/clearlooks_style.c index e06b32e1e4..48b6647df3 100644 --- a/libs/clearlooks/clearlooks_style.c +++ b/libs/clearlooks/clearlooks_style.c @@ -860,7 +860,7 @@ clearlooks_style_draw_box (DRAW_ARGS) } else if (DETAIL ("hseparator") || DETAIL ("vseparator")) { - gchar *new_detail = detail; + const gchar *new_detail = detail; /* Draw a normal separator, we just use this because it gives more control * over sizing (currently). */ diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc index 142d224171..a3b2a13bf5 100644 --- a/libs/gtkmm2ext/barcontroller.cc +++ b/libs/gtkmm2ext/barcontroller.cc @@ -149,7 +149,7 @@ BarController::button_release (GdkEventButton* ev) } else { double scale; - if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { + if ((ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { scale = 0.01; } else if (ev->state & GDK_CONTROL_MASK) { scale = 0.1; @@ -179,7 +179,7 @@ BarController::scroll (GdkEventScroll* ev) { double scale; - if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { + if ((ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { scale = 0.01; } else if (ev->state & GDK_CONTROL_MASK) { scale = 0.1; @@ -215,7 +215,7 @@ BarController::motion (GdkEventMotion* ev) return TRUE; } - if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { + if ((ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { scale = 0.01; } else if (ev->state & GDK_CONTROL_MASK) { scale = 0.1; diff --git a/libs/midi++2/fd_midiport.cc b/libs/midi++2/fd_midiport.cc index 2fd7a5e5f2..6e4a8e9b7c 100644 --- a/libs/midi++2/fd_midiport.cc +++ b/libs/midi++2/fd_midiport.cc @@ -20,6 +20,7 @@ #include <fcntl.h> #include <cerrno> +#include <cstring> #include <pbd/error.h> #include <pbd/pathscanner.h> @@ -65,7 +66,7 @@ FD_MidiPort::FD_MidiPort (const XMLNode& node, midi_filename_pattern = new string (pattern); } - if (desc.mode & O_NONBLOCK == 0) { + if ((desc.mode & O_NONBLOCK) == 0) { /* we unconditionally set O_NONBLOCK during open, but the request didn't ask for it, so remove it. diff --git a/libs/midi++2/midi.cc b/libs/midi++2/midi.cc index 7c2dc835fb..1d45dc57f5 100644 --- a/libs/midi++2/midi.cc +++ b/libs/midi++2/midi.cc @@ -18,6 +18,7 @@ $Id$ */ +#include <cstring> #include <string> #include <cstdlib> #include <midi++/types.h> diff --git a/libs/midi++2/midichannel.cc b/libs/midi++2/midichannel.cc index fe4f4afeb2..c8a18f2ee2 100644 --- a/libs/midi++2/midichannel.cc +++ b/libs/midi++2/midichannel.cc @@ -18,6 +18,7 @@ $Id$ */ +#include <cstring> #include <midi++/types.h> #include <midi++/port.h> #include <midi++/channel.h> diff --git a/libs/midi++2/midiparser.cc b/libs/midi++2/midiparser.cc index a1f6ce39b4..bfced4d7cf 100644 --- a/libs/midi++2/midiparser.cc +++ b/libs/midi++2/midiparser.cc @@ -21,6 +21,7 @@ $Id$ */ +#include <cstring> #include <cstdlib> #include <unistd.h> #include <string> diff --git a/libs/midi++2/mtc.cc b/libs/midi++2/mtc.cc index 7fd86eff35..13f5221929 100644 --- a/libs/midi++2/mtc.cc +++ b/libs/midi++2/mtc.cc @@ -18,6 +18,7 @@ $Id$ */ +#include <cstring> #include <cstdlib> #include <unistd.h> #include <string> diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc index 8dd056b783..94d039ba86 100644 --- a/libs/pbd/base_ui.cc +++ b/libs/pbd/base_ui.cc @@ -17,6 +17,7 @@ */ +#include <cstring> #include <stdint.h> #include <unistd.h> #include <fcntl.h> diff --git a/libs/pbd/convert.cc b/libs/pbd/convert.cc index 2ce99ba631..fc84bbad5e 100644 --- a/libs/pbd/convert.cc +++ b/libs/pbd/convert.cc @@ -19,6 +19,7 @@ #include <cmath> #include <stdint.h> +#include <stdlib.h> #ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS #endif @@ -101,13 +102,13 @@ short_version (string orig, string::size_type target_length) int atoi (const string& s) { - return std::atoi (s.c_str()); + return ::atoi (s.c_str()); } double atof (const string& s) { - return std::atof (s.c_str()); + return ::atof (s.c_str()); } vector<string> diff --git a/libs/pbd/mountpoint.cc b/libs/pbd/mountpoint.cc index c1bcb375f3..acc549890a 100644 --- a/libs/pbd/mountpoint.cc +++ b/libs/pbd/mountpoint.cc @@ -19,6 +19,7 @@ */ #include <cstdio> +#include <cstring> #include <string> #include <limits.h> diff --git a/libs/pbd/pathscanner.cc b/libs/pbd/pathscanner.cc index 2af227a3a0..eb913cc910 100644 --- a/libs/pbd/pathscanner.cc +++ b/libs/pbd/pathscanner.cc @@ -18,6 +18,7 @@ $Id$ */ +#include <cstring> #include <cstdlib> #include <cstdio> #include <vector> diff --git a/libs/pbd/pbd/ringbuffer.h b/libs/pbd/pbd/ringbuffer.h index d98601461e..3502bed21b 100644 --- a/libs/pbd/pbd/ringbuffer.h +++ b/libs/pbd/pbd/ringbuffer.h @@ -20,6 +20,7 @@ #ifndef ringbuffer_h #define ringbuffer_h +#include <cstring> #include <glib.h> template<class T> diff --git a/libs/pbd/pool.cc b/libs/pbd/pool.cc index be8032b7b6..434429e69d 100644 --- a/libs/pbd/pool.cc +++ b/libs/pbd/pool.cc @@ -18,6 +18,7 @@ $Id$ */ +#include <cstdlib> #include <iostream> #include <vector> diff --git a/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp b/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp index 1549b4f3aa..63cbfecfd1 100644 --- a/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp +++ b/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp @@ -34,6 +34,8 @@ authorization. */ +#include <cstring> +#include <cstdlib> #include "PluginAdapter.h" //#define DEBUG_PLUGIN_ADAPTER 1 diff --git a/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp b/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp index 12e15393fc..24f91e5f50 100644 --- a/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp +++ b/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp @@ -34,6 +34,7 @@ authorization. */ +#include <stdlib.h> #include "PluginHostAdapter.h" namespace Vamp diff --git a/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp b/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp index 99baac3b72..9d627a75cf 100644 --- a/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp +++ b/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp @@ -42,6 +42,7 @@ #include <fstream> #include <cctype> // tolower +#include <cstring> #ifdef _WIN32 |