try to fix various warnings from gcc when optimization flags are enabled

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 088eec17e5b7bb39fd42c5ac4584ff070a3f5f28..7b84219b750883553a5cc375bb6e329b91b79006 100644 (file)
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -264,7 +264,7 @@ AudioStreamView::setup_rec_box ()
                        at = _trackview.audio_track(); /* we know what it is already */
                        framepos_t const frame_pos = at->current_capture_start ();
                        gdouble xstart = _trackview.editor().sample_to_pixel (frame_pos);
-                       gdouble xend;
+                       gdouble xend = xstart; /* keeps gcc optimized happy, really set in switch() below */
                        uint32_t fill_color;
 
                        switch (_trackview.audio_track()->mode()) {

diff --git a/libs/ardour/ardour/cycle_timer.h b/libs/ardour/ardour/cycle_timer.h
index 35cc2a4c735238a59c043f1c68a9bc6b881b3e96..839b54150c27bb4ddca9b951a7877f74f6bf65c0 100644 (file)
--- a/libs/ardour/ardour/cycle_timer.h
+++ b/libs/ardour/ardour/cycle_timer.h
@@ -48,6 +48,8 @@ class CycleTimer {
                        }
                        _entry = get_cycles();
                }
+#else
+               (void) name;
 #endif
        }
 

diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc
index 82e5d80244ff21d63f40277addc117822aef5c0d..8c5a7e4abefe1368a1d367c2f3416abb40752eea 100644 (file)
--- a/libs/ardour/export_channel.cc
+++ b/libs/ardour/export_channel.cc
@@ -239,7 +239,11 @@ RouteExportChannel::read (Sample const *& data, framecnt_t frames) const
 {
        assert(processor);
        AudioBuffer const & buffer = processor->get_capture_buffers().get_audio (channel);
+#ifndef NDEBUG
+       (void) frames;
+#else
        assert (frames <= (framecnt_t) buffer.size());
+#endif
        data = buffer.data();
 }
 

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 9850d82d314b96b92d10fdab178db6d099410cd6..2cd886b03ea9f95858f56da1eef6de3915b90b0b 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -525,8 +525,8 @@ ARDOUR::set_translations_enabled (bool yn)
                c = '0';
        }
        
-       ::write (fd, &c, 1);
-       ::close (fd);
+       (void) ::write (fd, &c, 1);
+       (void) ::close (fd);
 
        return true;
 }

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 90522a7e06b2ca76efea55d2bff2b49e7f5b355f..b5be296b1afae32d205e6eb7d8ea3aa7430b1f85 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -678,6 +678,10 @@ PluginManager::lxvst_discover_from_path (string path)
        vector<string *>::iterator x;
        int ret = 0;
 
+#ifndef NDEBUG
+       (void) path;
+#endif
+
        DEBUG_TRACE (DEBUG::PluginManager, string_compose ("Discovering linuxVST plugins along %1\n", path));
 
        plugin_objects = scanner (lxvst_path, lxvst_filter, 0, false, true);

diff --git a/libs/audiographer/audiographer/debuggable.h b/libs/audiographer/audiographer/debuggable.h
index 79e0f80dd30a5a8f11a1107fcfb75fdcb687aba2..7835849f277a75a816c5f2eb721b68ab82e8a70a 100644 (file)
--- a/libs/audiographer/audiographer/debuggable.h
+++ b/libs/audiographer/audiographer/debuggable.h
@@ -43,12 +43,12 @@ class Debuggable
                : stream (debug_stream) {}
 
        bool debug_level (DebugLevel level) {
-               #ifdef NDEBUG
-               level = DEFAULT_DEBUG_LEVEL; /* stop pedantic gcc complaints about unused parameter */
+#ifndef NDEBUG
+               (void) level; /* stop pedantic gcc complaints about unused parameter */
                return false;
-               #else
+#else
                return L >= level;
-               #endif
+#endif
        }
        std::ostream & debug_stream() { return stream; }
 

diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc
index 86e5b9d54c0c2b52fda68b20269c0572558bdc4f..d45719036f3146c1ad56e25f6863cf785cc2bbb4 100644 (file)
--- a/libs/backends/jack/jack_audiobackend.cc
+++ b/libs/backends/jack/jack_audiobackend.cc
@@ -764,9 +764,6 @@ JACKAudioBackend::jack_sync_callback (jack_transport_state_t state, jack_positio
        TransportState tstate;
 
        switch (state) {
-       case JackTransportStopped:
-               tstate = TransportStopped;
-               break;
        case JackTransportRolling:
                tstate = TransportRolling;
                break;
@@ -776,6 +773,10 @@ JACKAudioBackend::jack_sync_callback (jack_transport_state_t state, jack_positio
        case JackTransportStarting:
                tstate = TransportStarting;
                break;
+       case JackTransportStopped:
+       default:
+               tstate = TransportStopped;
+               break;
        }
 
        return engine.sync_callback (tstate, pos->frame);

diff --git a/libs/evoral/src/libsmf/smf.c b/libs/evoral/src/libsmf/smf.c
index b79d7543b639d52cf845972bc50ceb977c65b9da..c062f99659dfa40f65873fb4a0bb51bb298cdf3e 100644 (file)
--- a/libs/evoral/src/libsmf/smf.c
+++ b/libs/evoral/src/libsmf/smf.c
@@ -151,7 +151,9 @@ smf_track_delete(smf_track_t *track)
 void
 smf_add_track(smf_t *smf, smf_track_t *track)
 {
+#ifndef NDEBUG
        int cantfail;
+#endif
 
        assert(track->smf == NULL);
 
@@ -162,8 +164,13 @@ smf_add_track(smf_t *smf, smf_track_t *track)
        track->track_number = smf->number_of_tracks;
 
        if (smf->number_of_tracks > 1) {
+#ifndef NDEBUG
                cantfail = smf_set_format(smf, 1);
                assert(!cantfail);
+#else
+               smf_set_format(smf, 1);
+#endif
+               
        }
 }
 
@@ -860,9 +867,8 @@ smf_get_next_event(smf_t *smf)
 void
 smf_skip_next_event(smf_t *smf)
 {
-       void *notused;
-
-       notused = smf_get_next_event(smf);
+       smf_event_t *ignored = smf_get_next_event(smf);
+       (void) ignored;
 }
 
 /**

diff --git a/libs/evoral/src/libsmf/smf_decode.c b/libs/evoral/src/libsmf/smf_decode.c
index 0951a6e2f881cf86a24ed3b19e59143b5cd30dcf..bfba08e9f9d64f48fe87d9d70faec27e14c2e76d 100644 (file)
--- a/libs/evoral/src/libsmf/smf_decode.c
+++ b/libs/evoral/src/libsmf/smf_decode.c
@@ -490,7 +490,7 @@ static void
 note_from_int(char *buf, int note_number)
 {
        int note, octave;
-       char *names[] = {"C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"};
+       const char *names[] = {"C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"};
 
        octave = note_number / 12 - 1;
        note = note_number % 12;

diff --git a/libs/evoral/src/libsmf/smf_private.h b/libs/evoral/src/libsmf/smf_private.h
index 537a29b889b75ce15b92144ad371acad4d1a81f5..f415eac9da4f18b52b6448643d6a9e84e2c66e70 100644 (file)
--- a/libs/evoral/src/libsmf/smf_private.h
+++ b/libs/evoral/src/libsmf/smf_private.h
@@ -75,6 +75,7 @@ void remove_last_tempo_with_pulses(smf_t *smf, size_t pulses);
 int smf_event_is_tempo_change_or_time_signature(const smf_event_t *event) WARN_UNUSED_RESULT;
 int smf_event_length_is_valid(const smf_event_t *event) WARN_UNUSED_RESULT;
 int is_status_byte(const unsigned char status) WARN_UNUSED_RESULT;
+smf_track_t* smf_find_track_with_next_event (smf_t *smf);
 
 #endif /* SMF_PRIVATE_H */
 

diff --git a/libs/evoral/src/libsmf/smf_save.c b/libs/evoral/src/libsmf/smf_save.c
index b99af75461b094207d11d3b9f967fe0aa6d1d7db..1941ed4f7ba874505eab98190a15eeb066be1f73 100644 (file)
--- a/libs/evoral/src/libsmf/smf_save.c
+++ b/libs/evoral/src/libsmf/smf_save.c
@@ -215,7 +215,11 @@ smf_event_new_textual(int type, const char *text)
        vlq_length = smf_format_vlq(event->midi_buffer + 2, MAX_VLQ_LENGTH - 2, text_length);
        copied_length = snprintf((char *)event->midi_buffer + vlq_length + 2, event->midi_buffer_length - vlq_length - 2, "%s", text);
 
+#ifndef NDEBUG
+       (void) copied_length; /* stop gcc warning about unusued vars for non-debug build */
+#else
        assert(copied_length == text_length);
+#endif
 
        event->midi_buffer_length = 2 + vlq_length + text_length;
 

diff --git a/libs/evoral/src/libsmf/smf_tempo.c b/libs/evoral/src/libsmf/smf_tempo.c
index c24e7460c1e060fb21c7bdff1231979d90d8d8e4..1d89639218c81f2076e836b2c715a0b40e12cd31 100644 (file)
--- a/libs/evoral/src/libsmf/smf_tempo.c
+++ b/libs/evoral/src/libsmf/smf_tempo.c
@@ -133,13 +133,13 @@ maybe_add_to_tempo_map(smf_event_t *event)
 
        /* Tempo Change? */
        if (event->midi_buffer[1] == 0x51) {
-               int new_tempo = (event->midi_buffer[3] << 16) + (event->midi_buffer[4] << 8) + event->midi_buffer[5];
-               if (new_tempo <= 0) {
+               int ntempo = (event->midi_buffer[3] << 16) + (event->midi_buffer[4] << 8) + event->midi_buffer[5];
+               if (ntempo <= 0) {
                        g_critical("Ignoring invalid tempo change.");
                        return;
                }
 
-               add_tempo(event->track->smf, event->time_pulses, new_tempo);
+               add_tempo(event->track->smf, event->time_pulses, ntempo);
        }
 
        /* Time Signature? */

diff --git a/libs/pbd/fpu.cc b/libs/pbd/fpu.cc
index 40f8cca9d6e9371b125d0fce45bd2df0e9bd26d2..8929491cd9976fea1589dbd18b7cc6ac5df51a7b 100644 (file)
--- a/libs/pbd/fpu.cc
+++ b/libs/pbd/fpu.cc
@@ -105,9 +105,9 @@ FPU::FPU ()
                *fxbuf = (char *) malloc (512);
                assert (*fxbuf);
 #else
-               posix_memalign ((void **) &fxbuf, 16, sizeof (char *));
+               (void) posix_memalign ((void **) &fxbuf, 16, sizeof (char *));
                assert (fxbuf);
-               posix_memalign ((void **) fxbuf, 16, 512);
+               (void) posix_memalign ((void **) fxbuf, 16, 512);
                assert (*fxbuf);
 #endif                 
                

diff --git a/libs/pbd/openuri.cc b/libs/pbd/openuri.cc
index 45154d0ad1b1501357b3e8f74294383ca89b0892..13d534e7606f9eb0102be399efdeb3d79a5ecd0c 100644 (file)
--- a/libs/pbd/openuri.cc
+++ b/libs/pbd/openuri.cc
@@ -49,7 +49,7 @@ PBD::open_uri (const char* uri)
        std::string command = "xdg-open ";
        command += uri;
        command += " &";
-       system (command.c_str());
+       (void) system (command.c_str());
 
        return true;
 #endif

diff --git a/libs/pbd/semutils.cc b/libs/pbd/semutils.cc
index 9ac5f60d351561f405b9852926f541c1e9118d75..48fdd249f60f9e8879ef1c69a26323ad1dcb0e76 100644 (file)
--- a/libs/pbd/semutils.cc
+++ b/libs/pbd/semutils.cc
@@ -35,6 +35,8 @@ ProcessSemaphore::ProcessSemaphore (const char* name, int val)
        }
 
 #else
+       (void) name; /* stop gcc warning on !Apple systems */
+
        if (sem_init (&_sem, 0, val)) {
                throw failed_constructor ();
        }