From c615e26f3c7155105b8520879111ff7c214f9772 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 7 Jan 2016 18:11:15 -0500 Subject: [PATCH] coreaudio: factor out common code for stuffing MIDI data into a CoreMidiPort buffer --- libs/backends/coreaudio/coreaudio_backend.cc | 3 +-- libs/backends/coreaudio/coreaudio_backend.h | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index beeeb2e867..4e2349cd7f 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -1343,9 +1343,8 @@ CoreAudioBackend::midi_event_get ( return 0; } - int -CoreAudioBackend::midi_event_put ( +CoreAudioBackend::_midi_event_put ( void* port_buffer, pframes_t timestamp, const uint8_t* buffer, size_t size) diff --git a/libs/backends/coreaudio/coreaudio_backend.h b/libs/backends/coreaudio/coreaudio_backend.h index 5682cc6966..8bec7d939a 100644 --- a/libs/backends/coreaudio/coreaudio_backend.h +++ b/libs/backends/coreaudio/coreaudio_backend.h @@ -349,7 +349,9 @@ class CoreAudioBackend : public AudioBackend { /* MIDI */ int midi_event_get (pframes_t& timestamp, size_t& size, uint8_t** buf, void* port_buffer, uint32_t event_index); - int midi_event_put (void* port_buffer, pframes_t timestamp, const uint8_t* buffer, size_t size); + int midi_event_put (void* port_buffer, pframes_t timestamp, const uint8_t* buffer, size_t size) { + return _midi_event_put (port_buffer, timestamp, buffer, size); + } uint32_t get_midi_event_count (void* port_buffer); void midi_clear (void* port_buffer); @@ -382,6 +384,8 @@ class CoreAudioBackend : public AudioBackend { void pre_process (); void coremidi_rediscover (); + static int _midi_event_put (void* port_buffer, pframes_t timestamp, const uint8_t* buffer, size_t size); + private: std::string _instance_name; CoreAudioPCM *_pcmio; -- 2.30.2