Fixes for GCC 4.3.
authorDavid Robillard <d@drobilla.net>
Fri, 2 May 2008 18:35:05 +0000 (18:35 +0000)
committerDavid Robillard <d@drobilla.net>
Fri, 2 May 2008 18:35:05 +0000 (18:35 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@3303 d708f5d6-7413-0410-9779-e7cbd77b26cf

40 files changed:
gtk2_ardour/actions.cc
gtk2_ardour/automation_controller.cc
gtk2_ardour/editing.cc
gtk2_ardour/editor.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/fft_result.cc
gtk2_ardour/midi_region_view.cc
gtk2_ardour/new_session_dialog.cc
gtk2_ardour/route_time_axis.cc
gtk2_ardour/sfdb_ui.cc
libs/ardour/amp.cc
libs/ardour/ardour/audio_buffer.h
libs/ardour/ardour/silentfilesource.h
libs/ardour/audio_diskstream.cc
libs/ardour/audioanalyser.cc
libs/ardour/automation_event.cc
libs/ardour/find_session.cc
libs/ardour/gdither.cc
libs/ardour/midi_diskstream.cc
libs/ardour/recent_sessions.cc
libs/ardour/session.cc
libs/ardour/smf_reader.cc
libs/ardour/sndfilesource.cc
libs/ardour/utils.cc
libs/clearlooks/clearlooks_style.c
libs/gtkmm2ext/barcontroller.cc
libs/midi++2/fd_midiport.cc
libs/midi++2/midi.cc
libs/midi++2/midichannel.cc
libs/midi++2/midiparser.cc
libs/midi++2/mtc.cc
libs/pbd/base_ui.cc
libs/pbd/convert.cc
libs/pbd/mountpoint.cc
libs/pbd/pathscanner.cc
libs/pbd/pbd/ringbuffer.h
libs/pbd/pool.cc
libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp
libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp
libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp

index ced1ba3a409d9770dfcb9cdc30d2f7872a0de120..f25dc1c9b201f4c4283d257b6677c6791e1c6f23 100644 (file)
@@ -17,6 +17,7 @@
 
 */
 
+#include <cstring>
 #include <vector>
 #include <string>
 #include <list>
index 8483bab3933217d49e8175433b7a3015eba261bb..dfbdb30ffe42f348e8ebe4289497c975a136af9f 100644 (file)
@@ -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
index 963b83647ca1407cd0a89a8c74d9fe6f7403ea2d..2874e69308acc2504614d9a1fc073279646e8a3a 100644 (file)
@@ -18,6 +18,7 @@
 */
 
 #include <string>
+#include <cstring>
 
 #include "editing.h"
 
index dff2271a80301d0d599aa3bcebba2f8b00096b09..3d14d9617805ea72919ef7fd56afe90005158bb4 100644 (file)
@@ -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
                 */
index e6c3ca972b24f47cdc5649f9e394569ac3d38d86..e1d320e386f05eb1b50e7cc71cd5c8ae36e79fe9 100644 (file)
@@ -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;
        }
index d692b9152b8c662871189b62d1a1205626aedf76..a9858542a358e6981893dcb6c65f6f8aa7618cf5 100644 (file)
@@ -21,6 +21,7 @@
 #include <fft_result.h>
 #include <fft_graph.h>
 #include <cstdlib>
+#include <cstring>
 #include <string>
 #include <cmath>
 
index d1b5f749900d158123f43b9d728736362eec87ee..fb3d68fa144c295c93a4964b8d67d7dc89586e14 100644 (file)
@@ -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)
index 22ddfa395da749fd360adc24c758d7889b570d7e..4c128d4bf37366155806f88de9ee6285233dd5e2 100644 (file)
@@ -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
index 384e3e553829c4e4c0de441a76805091e5c4d824..1977858f0fc2beeba4bcd52ef1c36cd46619d9a1 100644 (file)
@@ -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);
        }
 
index 6fa74e986cc352fed6f297137f32a1e9d7a3885b..b7b853ebec359b03d9dc4b31431a8ac53037fefa 100644 (file)
@@ -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;
index ae540b86e8335530cb979fdbcbed45a978901af7..a2ad70e8b1a303eec6c1d9c0bb5b03d6d1bef544 100644 (file)
     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>
 
index 1f6c2f63bf15411c59d1cf47580850e0fdd85b9f..71eaf60ade8cf7073cc0235af981cf4be54221bd 100644 (file)
@@ -19,6 +19,7 @@
 #ifndef __ardour_audio_buffer_h__
 #define __ardour_audio_buffer_h__
 
+#include <cstring>
 #include <ardour/buffer.h>
 
 namespace ARDOUR {
index 87065c1cd01be5b505c517753e064ab5db1f309c..cbb123139a78b3c6b0b71f072f1289c0fd35b57d 100644 (file)
@@ -20,6 +20,7 @@
 #ifndef __ardour_silentfilesource_h__ 
 #define __ardour_silentfilesource_h__
 
+#include <cstring>
 #include <ardour/audiofilesource.h>
 
 namespace ARDOUR {
index 059fed8752fdab0b9eb1332395c67fa0fd7422f7..59e6007a6dafc138fc06f0037f24a1a7dd5a5642 100644 (file)
@@ -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 */
 
index eccc38434d9c0b39b1e6d3faf5521e67ea7a5e3e..98c42063015b842d55b0cd741ec45247eac21c41 100644 (file)
@@ -1,3 +1,4 @@
+#include <cstring>
 #include <vamp-sdk/hostext/PluginLoader.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
index a3edc9dcde8adce29ccb259a7e59e735a611de1f..e01e349281265b35cb234803c09b7f22629b3bc1 100644 (file)
@@ -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;
index f8ed3d5a46867e63274abb3c7f3f2e99e41e53da..4388d8e2991a341927be2bab4ad2ff0b9d80d6d5 100644 (file)
@@ -1,6 +1,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
+#include <cstring>
 #include <climits>
 #include <cerrno>
 
index 7242f857c8f94f217ab73752a72213dece277514..ac47a0a61edd1fb833e32e919821d35a65522300 100644 (file)
@@ -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,
index 885435e2388f11d9ab92739df8b00f1365886576..2e1647f507255e430eadcc3de328452157610c4a 100644 (file)
@@ -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;
        }
 
index ebc5499f89134e4d28dce90cb88742505cecd13c..9b8668dd88b00699cb4b7d580e4e9e58a86eb056 100644 (file)
@@ -17,6 +17,7 @@
 
 */
 
+#include <cstring>
 #include <cerrno>
 #include <unistd.h>
 #include <fstream>
index 8357b7e901433f1e605bac7542d9631f3f06559d..ff269cc931175bd77849db6099c41bef322f9e71 100644 (file)
@@ -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),
index 63a020f141a9ba71447fbe45066f0d6230cc30cd..c5e715c2ce830f8beca4a73c1ba03b97fd620785 100644 (file)
@@ -17,6 +17,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <cstring>
 #include <cstdio>
 #include <cassert>
 #include <iostream>
index e53496434372e4b8edade139bd7b1c02ca9bf5d3..ab090381b4d27caea3a4d676b7e4910d3b109181 100644 (file)
@@ -17,6 +17,7 @@
 
 */
 
+#include <cstring>
 #include <cerrno>
 #include <climits>
 
index 50b9ff320e2253c8090dc5c5e3bad9ff29cd712c..f30f568f9d810ef3eaafb2bfcab3b7486d8b1302 100644 (file)
@@ -21,6 +21,7 @@
 #include <stdint.h>
 
 #include <cstdio> /* for sprintf */
+#include <cstring>
 #include <cmath>
 #include <cctype>
 #include <string>
index e06b32e1e41eb5a6ecee0e751c541504baa8837f..48b6647df382449690da0e3fa7d002cc9ea2d07c 100644 (file)
@@ -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). */
 
index 142d22417185efb8bb9080ac8bb03174e23a7d30..a3b2a13bf5aaf37ed08a4e5bab6910c7cd95a880 100644 (file)
@@ -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;
index 2fd7a5e5f2994589c6b1ce57a675765bf6aebe85..6e4a8e9b7ce92f9f3f4011e273d096b6946f8477 100644 (file)
@@ -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.
index 7c2dc835fb3fbf5347d4d5bd2257064f939abfaf..1d45dc57f510a82b1ce9738103ef10594b5c874f 100644 (file)
@@ -18,6 +18,7 @@
     $Id$
 */
 
+#include <cstring>
 #include <string>
 #include <cstdlib>
 #include <midi++/types.h>
index fe4f4afeb2be4ded28364dfd555e79b5eaf9ae1b..c8a18f2ee260bcea34d9ee0ebe6080c7ff61876f 100644 (file)
@@ -18,6 +18,7 @@
     $Id$
 */
 
+#include <cstring>
 #include <midi++/types.h>
 #include <midi++/port.h>
 #include <midi++/channel.h>
index a1f6ce39b43ad73c9033bf67683c3e8922120c9d..bfced4d7cf2a7871ceec72a10b68de8c9c7bd33e 100644 (file)
@@ -21,6 +21,7 @@
     $Id$
 */
 
+#include <cstring>
 #include <cstdlib>
 #include <unistd.h>
 #include <string>
index 7fd86eff354453e9822e716c84407efa5717535b..13f52219290b0f8d653cd9b85ce6ad0a07f6f626 100644 (file)
@@ -18,6 +18,7 @@
     $Id$
 */
 
+#include <cstring>
 #include <cstdlib>
 #include <unistd.h>
 #include <string>
index 8dd056b783a2ab4fc9c0361eb9fccd94005fc526..94d039ba8633aef20c4d9f462527831a7e996de6 100644 (file)
@@ -17,6 +17,7 @@
 
 */
 
+#include <cstring>
 #include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
index 2ce99ba631c864413442b0c121c1ce6da505e91a..fc84bbad5e060fe9a8402595548e5be051ad2c65 100644 (file)
@@ -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>
index c1bcb375f3a67f84d1a4d4cc8febb827f6a84de7..acc549890a81c65eb469528cf36009575dc695db 100644 (file)
@@ -19,6 +19,7 @@
 */
 
 #include <cstdio>
+#include <cstring>
 #include <string>
 #include <limits.h>
 
index 2af227a3a03743935bde875aa592df7c9ca668ff..eb913cc910d923b7f5e7d43471056639df411c97 100644 (file)
@@ -18,6 +18,7 @@
     $Id$
 */
 
+#include <cstring>
 #include <cstdlib>
 #include <cstdio>
 #include <vector>
index d98601461e684eea5e5bf2d478877e8cd33ee3c1..3502bed21b71cfac2759957b2158f057bfe204a4 100644 (file)
@@ -20,6 +20,7 @@
 #ifndef ringbuffer_h
 #define ringbuffer_h
 
+#include <cstring>
 #include <glib.h>
 
 template<class T>
index be8032b7b63520d31d2a431694b2298f5a19634b..434429e69d7d93e386b5a1a0e96272243c920035 100644 (file)
@@ -18,6 +18,7 @@
     $Id$
 */
 
+#include <cstdlib>
 #include <iostream>
 #include <vector>
 
index 1549b4f3aa17b99eb9ef29f4074e5f73c638b97e..63cbfecfd14ee2edad582f4d3867682220206690 100644 (file)
@@ -34,6 +34,8 @@
     authorization.
 */
 
+#include <cstring>
+#include <cstdlib>
 #include "PluginAdapter.h"
 
 //#define DEBUG_PLUGIN_ADAPTER 1
index 12e15393fc4da33659b7e9e70ad61cddfcb35d81..24f91e5f502321da12fadc56a143447b79292144 100644 (file)
@@ -34,6 +34,7 @@
     authorization.
 */
 
+#include <stdlib.h>
 #include "PluginHostAdapter.h"
 
 namespace Vamp
index 99baac3b72b48c7a8ddceafd65a3438561a8bc9d..9d627a75cfa04937327fa8d2a7adf60c04ea2183 100644 (file)
@@ -42,6 +42,7 @@
 
 #include <fstream>
 #include <cctype> // tolower
+#include <cstring>
 
 #ifdef _WIN32