try to fix various warnings from gcc when optimization flags are enabled
This commit is contained in:
parent
342237bf9c
commit
0cca272431
|
@ -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()) {
|
||||
|
|
|
@ -48,6 +48,8 @@ class CycleTimer {
|
|||
}
|
||||
_entry = get_cycles();
|
||||
}
|
||||
#else
|
||||
(void) name;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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; }
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 */
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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? */
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue