summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-08-05 16:03:17 +0200
committerRobin Gareus <robin@gareus.org>2017-08-05 16:06:15 +0200
commit8c61c7f14a8136b877368be7d20fe4eaf8e5bf88 (patch)
treee230b62f1c8b9ee6d91022e5d31b246488dd605a /libs
parentbc46a7e2e9bf8688dd6461369978555f835cc623 (diff)
amend f4c76f89d3a; fix blind coding typos
Diffstat (limited to 'libs')
-rw-r--r--libs/backends/coreaudio/coreaudio_backend.cc4
-rw-r--r--libs/backends/coreaudio/coreaudio_backend.h2
-rw-r--r--libs/backends/coreaudio/coremidi_io.cc6
3 files changed, 6 insertions, 6 deletions
diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc
index be8005c690..66f184ec63 100644
--- a/libs/backends/coreaudio/coreaudio_backend.cc
+++ b/libs/backends/coreaudio/coreaudio_backend.cc
@@ -1417,7 +1417,7 @@ CoreAudioBackend::midi_event_get (
if (event_index >= source.size ()) {
return -1;
}
- CoreMidiEvent const& event = source[event_index].get ();
+ CoreMidiEvent const& event = source[event_index];
timestamp = event.timestamp ();
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) {
const CoreMidiBuffer *src = static_cast<const CoreMidiPort*>(*it)->const_buffer();
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 ());
}
}
diff --git a/libs/backends/coreaudio/coreaudio_backend.h b/libs/backends/coreaudio/coreaudio_backend.h
index 5a036117ac..3d7b5be860 100644
--- a/libs/backends/coreaudio/coreaudio_backend.h
+++ b/libs/backends/coreaudio/coreaudio_backend.h
@@ -50,7 +50,7 @@ class CoreMidiEvent {
CoreMidiEvent (const CoreMidiEvent& other);
size_t size () const { return _size; };
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 (); };
private:
size_t _size;
diff --git a/libs/backends/coreaudio/coremidi_io.cc b/libs/backends/coreaudio/coremidi_io.cc
index 1d4f6fbf02..04bcaf1e59 100644
--- a/libs/backends/coreaudio/coremidi_io.cc
+++ b/libs/backends/coreaudio/coremidi_io.cc
@@ -321,10 +321,10 @@ CoreMidiIo::send_events (uint32_t port, double timescale, const void *b)
MIDIPacket *cur = MIDIPacketListInit(mpl);
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,
- AudioConvertNanosToHostTime(ts + (*mit)->timestamp() / timescale),
- (*mit)->size(), (*mit)->data());
+ AudioConvertNanosToHostTime(ts + mit->timestamp() / timescale),
+ mit->size(), mit->data());
if (!cur) {
#ifndef DEBUG
printf("CoreMidi: Packet list overflow, dropped events\n");