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

amend f4c76f89d3; fix blind coding typos

Browse source
This commit is contained in:
Robin Gareus 2017-08-05 16:03:17 +02:00
parent bc46a7e2e9
commit 8c61c7f14a
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/backends/coreaudio/coreaudio_backend.cc
View file

@ -1417,7 +1417,7 @@ CoreAudioBackend::midi_event_get (
if (event_index >= source.size ()) { if (event_index >= source.size ()) {
return -1; return -1;
} }
CoreMidiEvent const& event = source[event_index].get (); CoreMidiEvent const& event = source[event_index];
timestamp = event.timestamp (); timestamp = event.timestamp ();
size = event.size (); size = event.size ();
@ -1852,7 +1852,7 @@ CoreAudioBackend::process_callback (const uint32_t n_samples, const uint64_t hos
for (std::vector<CoreBackendPort*>::const_iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it, ++i) { for (std::vector<CoreBackendPort*>::const_iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it, ++i) {
const CoreMidiBuffer *src = static_cast<const CoreMidiPort*>(*it)->const_buffer(); const CoreMidiBuffer *src = static_cast<const CoreMidiPort*>(*it)->const_buffer();
for (CoreMidiBuffer::const_iterator mit = src->begin (); mit != src->end (); ++mit) { for (CoreMidiBuffer::const_iterator mit = src->begin (); mit != src->end (); ++mit) {
_midiio->send_event (i,tamp (), mit->data (), mit->size ()); _midiio->send_event (i, mit->timestamp (), mit->data (), mit->size ());
} }
} }

2
libs/backends/coreaudio/coreaudio_backend.h
View file

@ -50,7 +50,7 @@ class CoreMidiEvent {
CoreMidiEvent (const CoreMidiEvent& other); CoreMidiEvent (const CoreMidiEvent& other);
size_t size () const { return _size; }; size_t size () const { return _size; };
pframes_t timestamp () const { return _timestamp; }; pframes_t timestamp () const { return _timestamp; };
const uint8_t* () const { return _data; }; const uint8_t* data () const { return _data; };
bool operator< (const CoreMidiEvent &other) const { return timestamp () < other.timestamp (); }; bool operator< (const CoreMidiEvent &other) const { return timestamp () < other.timestamp (); };
private: private:
size_t _size; size_t _size;

6
libs/backends/coreaudio/coremidi_io.cc
View file

@ -321,10 +321,10 @@ CoreMidiIo::send_events (uint32_t port, double timescale, const void *b)
MIDIPacket *cur = MIDIPacketListInit(mpl); MIDIPacket *cur = MIDIPacketListInit(mpl);
for (CoreMidiBuffer::const_iterator mit = src->begin (); mit != src->end (); ++mit) { for (CoreMidiBuffer::const_iterator mit = src->begin (); mit != src->end (); ++mit) {
assert((*mit)->size() < 256); assert(mit->size() < 256);
cur = MIDIPacketListAdd(mpl, sizeof(bytes), cur, cur = MIDIPacketListAdd(mpl, sizeof(bytes), cur,
AudioConvertNanosToHostTime(ts + (*mit)->timestamp() / timescale), AudioConvertNanosToHostTime(ts + mit->timestamp() / timescale),
(*mit)->size(), (*mit)->data()); mit->size(), mit->data());
if (!cur) { if (!cur) {
#ifndef DEBUG #ifndef DEBUG
printf("CoreMidi: Packet list overflow, dropped events\n"); printf("CoreMidi: Packet list overflow, dropped events\n");