diff options
author | Robin Gareus <robin@gareus.org> | 2014-10-23 05:11:10 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2014-10-23 05:31:40 +0200 |
commit | 730e09ce65860d951d0edd9b5471278125915f0a (patch) | |
tree | 1f56e3208541994dc5e0aff55e789b233676b50e /libs/ardour | |
parent | ca48fffd72df21d7298bf00d1e73b1381d0ec0e3 (diff) |
another round of compiler warning fixes
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/ardour/midi_buffer.h | 2 | ||||
-rw-r--r-- | libs/ardour/audiofilesource.cc | 5 | ||||
-rw-r--r-- | libs/ardour/lv2_evbuf.c | 18 | ||||
-rw-r--r-- | libs/ardour/midi_port.cc | 2 |
4 files changed, 15 insertions, 12 deletions
diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h index 6571924bef..f0c76ca86c 100644 --- a/libs/ardour/ardour/midi_buffer.h +++ b/libs/ardour/ardour/midi_buffer.h @@ -92,7 +92,7 @@ public: } inline TimeType * timeptr() { - return ((TimeType*)(buffer->_data + offset)); + return reinterpret_cast<TimeType*>((uintptr_t)(buffer->_data + offset)); } inline iterator_base<BufferType, EventType>& operator++() { diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc index 9c1b969190..40c3d2f012 100644 --- a/libs/ardour/audiofilesource.cc +++ b/libs/ardour/audiofilesource.cc @@ -237,7 +237,10 @@ AudioFileSource::old_peak_path (string audio_path) char buf[32]; #ifdef __APPLE__ - snprintf (buf, sizeof (buf), "%u-%u-%d.peak", stat_mount.st_ino, stat_file.st_ino, _channel); + snprintf (buf, sizeof (buf), "%llu-%llu-%d.peak", + (unsigned long long)stat_mount.st_ino, + (unsigned long long)stat_file.st_ino, + _channel); #else snprintf (buf, sizeof (buf), "%" PRId64 "-%" PRId64 "-%d.peak", (int64_t) stat_mount.st_ino, (int64_t) stat_file.st_ino, _channel); #endif diff --git a/libs/ardour/lv2_evbuf.c b/libs/ardour/lv2_evbuf.c index 2802ab8c81..ae6d869b5f 100644 --- a/libs/ardour/lv2_evbuf.c +++ b/libs/ardour/lv2_evbuf.c @@ -166,13 +166,13 @@ lv2_evbuf_next(LV2_Evbuf_Iterator iter) uint32_t size; switch (evbuf->type) { case LV2_EVBUF_EVENT: - size = ((LV2_Event*)(evbuf->buf.event.data + offset))->size; + size = ((LV2_Event*)((uintptr_t)(evbuf->buf.event.data + offset)))->size; offset += lv2_evbuf_pad_size(sizeof(LV2_Event) + size); break; case LV2_EVBUF_ATOM: - size = ((LV2_Atom_Event*) + size = ((LV2_Atom_Event*)((uintptr_t) ((char*)LV2_ATOM_CONTENTS(LV2_Atom_Sequence, &evbuf->buf.atom) - + offset))->body.size; + + offset)))->body.size; offset += lv2_evbuf_pad_size(sizeof(LV2_Atom_Event) + size); break; } @@ -203,7 +203,7 @@ lv2_evbuf_get(LV2_Evbuf_Iterator iter, switch (iter.evbuf->type) { case LV2_EVBUF_EVENT: ebuf = &iter.evbuf->buf.event; - ev = (LV2_Event*)((char*)ebuf->data + iter.offset); + ev = (LV2_Event*)((uintptr_t)((char*)ebuf->data + iter.offset)); *frames = ev->frames; *subframes = ev->subframes; *type = ev->type; @@ -212,9 +212,9 @@ lv2_evbuf_get(LV2_Evbuf_Iterator iter, break; case LV2_EVBUF_ATOM: aseq = (LV2_Atom_Sequence*)&iter.evbuf->buf.atom; - aev = (LV2_Atom_Event*)( + aev = (LV2_Atom_Event*)((uintptr_t)( (char*)LV2_ATOM_CONTENTS(LV2_Atom_Sequence, aseq) - + iter.offset); + + iter.offset)); *frames = aev->time.frames; *subframes = 0; *type = aev->body.type; @@ -245,7 +245,7 @@ lv2_evbuf_write(LV2_Evbuf_Iterator* iter, return false; } - ev = (LV2_Event*)(ebuf->data + iter->offset); + ev = (LV2_Event*)((uintptr_t)(ebuf->data + iter->offset)); ev->frames = frames; ev->subframes = subframes; ev->type = type; @@ -264,9 +264,9 @@ lv2_evbuf_write(LV2_Evbuf_Iterator* iter, return false; } - aev = (LV2_Atom_Event*)( + aev = (LV2_Atom_Event*)((uintptr_t)( (char*)LV2_ATOM_CONTENTS(LV2_Atom_Sequence, aseq) - + iter->offset); + + iter->offset)); aev->time.frames = frames; aev->body.type = type; aev->body.size = size; diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc index 381441a8d6..82dabc4cba 100644 --- a/libs/ardour/midi_port.cc +++ b/libs/ardour/midi_port.cc @@ -208,7 +208,7 @@ MidiPort::flush_buffers (pframes_t nframes) cerr << "drop flushed event on the floor, time " << ev.time() << " too early for " << _global_port_buffer_offset << " + " << _port_buffer_offset; - for (int xx = 0; xx < ev.size(); ++xx) { + for (size_t xx = 0; xx < ev.size(); ++xx) { cerr << ' ' << hex << (int) ev.buffer()[xx]; } cerr << dec << endl; |