diff options
34 files changed, 50 insertions, 20 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 263171f3eb..19bb9839cd 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -3510,7 +3510,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 7aaccc62a8..8354e41f5f 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -384,7 +384,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/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc index 608fd5e646..1dd07c51e1 100644 --- a/gtk2_ardour/new_session_dialog.cc +++ b/gtk2_ardour/new_session_dialog.cc @@ -748,7 +748,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; @@ -756,7 +756,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; @@ -764,7 +764,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; @@ -774,7 +774,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; @@ -782,6 +782,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 db71753aaf..c3d4552044 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -1087,7 +1087,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 4daab8029d..5aeaa4841d 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -394,12 +394,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; gm = 0; diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h index 8a88802ecb..88a803e0c4 100644 --- a/libs/ardour/ardour/buffer.h +++ b/libs/ardour/ardour/buffer.h @@ -22,6 +22,7 @@ #define _XOPEN_SOURCE 600 #include <cstdlib> // for posix_memalign #include <cassert> +#include <cstring> #include <ardour/types.h> #include <ardour/data_type.h> diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h index 44e9dc00a8..74eef70d29 100644 --- a/libs/ardour/ardour/port.h +++ b/libs/ardour/ardour/port.h @@ -20,6 +20,7 @@ #ifndef __ardour_port_h__ #define __ardour_port_h__ +#include <cstring> #include <sigc++/signal.h> #include <pbd/failed_constructor.h> #include <ardour/ardour.h> 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 95040ed239..419efe897d 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -401,7 +401,7 @@ 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) || + 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/gdither.cc b/libs/ardour/gdither.cc index 7242f857c8..a7006a0949 100644 --- a/libs/ardour/gdither.cc +++ b/libs/ardour/gdither.cc @@ -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/recent_sessions.cc b/libs/ardour/recent_sessions.cc index f14661d3d0..93cd47cbff 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/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 46ccdf5e9e..06f6841b30 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 1138684546..eaf5d474d7 100644 --- a/libs/ardour/utils.cc +++ b/libs/ardour/utils.cc @@ -21,6 +21,7 @@ #include <cmath> #include <cctype> #include <string> +#include <cstring> #include <cerrno> #include <iostream> #include <sys/types.h> diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc index c3c15b4281..4389d8cab1 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..3117698d01 100644 --- a/libs/midi++2/midi.cc +++ b/libs/midi++2/midi.cc @@ -19,6 +19,7 @@ */ #include <string> +#include <cstring> #include <cstdlib> #include <midi++/types.h> diff --git a/libs/midi++2/midichannel.cc b/libs/midi++2/midichannel.cc index a6759b7962..51edf1c1f8 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 782c3a8239..b80a78d897 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..ab7495cb7b 100644 --- a/libs/pbd/base_ui.cc +++ b/libs/pbd/base_ui.cc @@ -21,6 +21,7 @@ #include <unistd.h> #include <fcntl.h> #include <errno.h> +#include <string.h> #include <pbd/base_ui.h> #include <pbd/error.h> @@ -84,20 +85,20 @@ BaseUI::setup_signal_pipe () */ if (pipe (signal_pipe)) { - error << string_compose (_("%1-UI: cannot create error signal pipe (%2)"), _name, std::strerror (errno)) + error << string_compose (_("%1-UI: cannot create error signal pipe (%2)"), _name, ::strerror (errno)) << endmsg; return -1; } if (fcntl (signal_pipe[0], F_SETFL, O_NONBLOCK)) { - error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal read pipe (%2)"), _name, std::strerror (errno)) + error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal read pipe (%2)"), _name, ::strerror (errno)) << endmsg; return -1; } if (fcntl (signal_pipe[1], F_SETFL, O_NONBLOCK)) { - error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal write pipe (%2)"), _name, std::strerror (errno)) + error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal write pipe (%2)"), _name, ::strerror (errno)) << endmsg; return -1; } diff --git a/libs/pbd/mountpoint.cc b/libs/pbd/mountpoint.cc index 054aff07de..6cefd7bf39 100644 --- a/libs/pbd/mountpoint.cc +++ b/libs/pbd/mountpoint.cc @@ -20,6 +20,7 @@ #include <cstdio> #include <string> +#include <cstring> #include <limits.h> #include <pbd/mountpoint.h> diff --git a/libs/pbd/pathscanner.cc b/libs/pbd/pathscanner.cc index 2af227a3a0..1a9cb985c1 100644 --- a/libs/pbd/pathscanner.cc +++ b/libs/pbd/pathscanner.cc @@ -20,6 +20,7 @@ #include <cstdlib> #include <cstdio> +#include <cstring> #include <vector> #include <dirent.h> 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 6230073652..ffaea3c1a2 100644 --- a/libs/pbd/pool.cc +++ b/libs/pbd/pool.cc @@ -20,6 +20,7 @@ #include <iostream> #include <vector> +#include <cstdlib> #include <pbd/pool.h> #include <pbd/error.h> diff --git a/libs/rubberband/src/FFT.cpp b/libs/rubberband/src/FFT.cpp index 4df1025659..1177d1dde4 100644 --- a/libs/rubberband/src/FFT.cpp +++ b/libs/rubberband/src/FFT.cpp @@ -22,6 +22,7 @@ #include <iostream> #include <map> #include <cstdio> +#include <cstdlib> #include <vector> namespace RubberBand { diff --git a/libs/rubberband/src/RingBuffer.h b/libs/rubberband/src/RingBuffer.h index a3673d32f2..60004e3fd8 100644 --- a/libs/rubberband/src/RingBuffer.h +++ b/libs/rubberband/src/RingBuffer.h @@ -15,6 +15,7 @@ #ifndef _RUBBERBAND_RINGBUFFER_H_ #define _RUBBERBAND_RINGBUFFER_H_ +#include <cstring> #include <sys/types.h> #ifndef _WIN32 diff --git a/libs/rubberband/src/StretchCalculator.cpp b/libs/rubberband/src/StretchCalculator.cpp index 77d1c50ddf..a4c8236a53 100644 --- a/libs/rubberband/src/StretchCalculator.cpp +++ b/libs/rubberband/src/StretchCalculator.cpp @@ -15,6 +15,7 @@ #include "StretchCalculator.h" #include <math.h> +#include <algorithm> #include <iostream> #include <deque> #include <set> diff --git a/libs/rubberband/src/Thread.cpp b/libs/rubberband/src/Thread.cpp index 2b37875f01..8b5e074932 100644 --- a/libs/rubberband/src/Thread.cpp +++ b/libs/rubberband/src/Thread.cpp @@ -14,6 +14,7 @@ #include "Thread.h" +#include <cstdlib> #include <iostream> #include <sys/time.h> diff --git a/libs/rubberband/src/Window.h b/libs/rubberband/src/Window.h index 305daa7332..28a3a0446b 100644 --- a/libs/rubberband/src/Window.h +++ b/libs/rubberband/src/Window.h @@ -16,6 +16,7 @@ #define _RUBBERBAND_WINDOW_H_ #include <cmath> +#include <cstdlib> #include <iostream> #include <map> diff --git a/libs/rubberband/src/main.cpp b/libs/rubberband/src/main.cpp index c4f9259ae6..2f8b386d51 100644 --- a/libs/rubberband/src/main.cpp +++ b/libs/rubberband/src/main.cpp @@ -14,9 +14,11 @@ #include "RubberBandStretcher.h" +#include <cstring> #include <iostream> #include <sndfile.h> #include <cmath> +#include <cstdlib> #include <sys/time.h> #include <time.h> #include "sysutils.h" 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..334c11103c 100644 --- a/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp +++ b/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp @@ -34,6 +34,7 @@ authorization. */ +#include <cstdlib> #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..4ed32d842c 100644 --- a/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp +++ b/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp @@ -40,6 +40,8 @@ #include "PluginChannelAdapter.h" #include "PluginBufferingAdapter.h" +#include <string> +#include <cstring> #include <fstream> #include <cctype> // tolower |