smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

small round of compiler warning fixes

Browse source
This commit is contained in:
Robin Gareus 2014-10-23 03:32:14 +02:00
parent e2c6eb0ba1
commit c6a3d6bc48
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/audioengine.h
View file

@ -55,7 +55,7 @@ class Port;
class Session;
class ProcessThread;
class AudioBackend;
class AudioBackendInfo;
struct AudioBackendInfo;
class LIBARDOUR_API AudioEngine : public SessionHandlePtr, public PortManager
{

2
libs/ardour/ardour/midi_buffer.h
View file

@ -87,7 +87,7 @@ public:
int event_size = Evoral::midi_event_size(ev_start);
assert(event_size >= 0);
return EventType(EventTypeMap::instance().midi_event_type(*ev_start),
*((TimeType*)(buffer->_data + offset)),
*(reinterpret_cast<TimeType*>((uintptr_t)(buffer->_data + offset))),
event_size, ev_start);
}

6
libs/ardour/midi_buffer.cc
View file

@ -190,7 +190,7 @@ MidiBuffer::push_back(TimeType time, size_t size, const uint8_t* data)
}
uint8_t* const write_loc = _data + _size;
*((TimeType*)write_loc) = time;
*(reinterpret_cast<TimeType*>((uintptr_t)write_loc)) = time;
memcpy(write_loc + stamp_size, data, size);
_size += stamp_size + size;
@ -242,7 +242,7 @@ MidiBuffer::insert_event(const Evoral::MIDIEvent<TimeType>& ev)
}
uint8_t* const write_loc = _data + insert_offset;
*((TimeType*)write_loc) = t;
*(reinterpret_cast<TimeType*>((uintptr_t)write_loc)) = t;
memcpy(write_loc + stamp_size, ev.buffer(), ev.size());
_size += bytes_to_merge;
@ -267,7 +267,7 @@ MidiBuffer::reserve(TimeType time, size_t size)
// write timestamp
uint8_t* write_loc = _data + _size;
*((TimeType*)write_loc) = time;
*(reinterpret_cast<TimeType*>((uintptr_t)write_loc)) = time;
// move write_loc to begin of MIDI buffer data to write to
write_loc += stamp_size;

8
libs/ardour/midi_ring_buffer.cc
View file

@ -57,8 +57,8 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
*/
this->peek (peekbuf, prefix_size);
ev_time = *((T*) peekbuf);
ev_size = *((uint32_t*)(peekbuf + sizeof(T) + sizeof (Evoral::EventType)));
ev_time = *(reinterpret_cast<T*>((uintptr_t)peekbuf));
ev_size = *(reinterpret_cast<uint32_t*>((uintptr_t)(peekbuf + sizeof(T) + sizeof (Evoral::EventType))));
if (ev_time >= end) {
DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 past end @ %2\n", ev_time, end));
@ -148,13 +148,13 @@ MidiRingBuffer<T>::flush (framepos_t /*start*/, framepos_t end)
*/
assert (success);
ev_time = *((T*) peekbuf);
ev_time = *(reinterpret_cast<T*>((uintptr_t)peekbuf));
if (ev_time >= end) {
break;
}
ev_size = *((uint32_t*)(peekbuf + sizeof(T) + sizeof (Evoral::EventType)));
ev_size = *(reinterpret_cast<uint32_t*>((uintptr_t)(peekbuf + sizeof(T) + sizeof (Evoral::EventType))));
this->increment_read_ptr (prefix_size);
this->increment_read_ptr (ev_size);
}

2
libs/backends/wavesaudio/waves_audiobackend.cc
View file

@ -117,8 +117,8 @@ WavesAudioBackend::WavesAudioBackend (AudioEngine& e)
, _sample_time_at_cycle_start (0)
, _freewheeling (false)
, _freewheel_thread_active (false)
, _audio_cycle_period_nanos (0)
, _dsp_load_accumulator (0)
, _audio_cycle_period_nanos (0)
, _dsp_load_history_length(0)
{
}