ardour/livetrax
13
0
Fork 0
Code

allow hotplugging CoreMidi devices.

Browse Source
This commit is contained in:
Robin Gareus 2015-03-09 00:26:01 +01:00
parent bc7be6fd3e
commit 72ed785940
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/backends/coreaudio/coreaudio_backend.cc
View File

@ -1205,7 +1205,7 @@ CoreAudioBackend::midi_event_get (
size_t& size, uint8_t** buf, void* port_buffer, size_t& size, uint8_t** buf, void* port_buffer,
uint32_t event_index) uint32_t event_index)
{ {
assert (buf && port_buffer); if (!buf || !port_buffer) return -1;
CoreMidiBuffer& source = * static_cast<CoreMidiBuffer*>(port_buffer); CoreMidiBuffer& source = * static_cast<CoreMidiBuffer*>(port_buffer);
if (event_index >= source.size ()) { if (event_index >= source.size ()) {
return -1; return -1;
@ -1224,7 +1224,7 @@ CoreAudioBackend::midi_event_put (
pframes_t timestamp, pframes_t timestamp,
const uint8_t* buffer, size_t size) const uint8_t* buffer, size_t size)
{ {
assert (buffer && port_buffer); if (!buffer || !port_buffer) return -1;
CoreMidiBuffer& dst = * static_cast<CoreMidiBuffer*>(port_buffer); CoreMidiBuffer& dst = * static_cast<CoreMidiBuffer*>(port_buffer);
if (dst.size () && (pframes_t)dst.back ()->timestamp () > timestamp) { if (dst.size () && (pframes_t)dst.back ()->timestamp () > timestamp) {
fprintf (stderr, "CoreMidiBuffer: it's too late for this event. %d > %d\n", fprintf (stderr, "CoreMidiBuffer: it's too late for this event. %d > %d\n",
@ -1238,14 +1238,14 @@ CoreAudioBackend::midi_event_put (
uint32_t uint32_t
CoreAudioBackend::get_midi_event_count (void* port_buffer) CoreAudioBackend::get_midi_event_count (void* port_buffer)
{ {
assert (port_buffer); if (!port_buffer) return 0;
return static_cast<CoreMidiBuffer*>(port_buffer)->size (); return static_cast<CoreMidiBuffer*>(port_buffer)->size ();
} }
void void
CoreAudioBackend::midi_clear (void* port_buffer) CoreAudioBackend::midi_clear (void* port_buffer)
{ {
assert (port_buffer); if (port_buffer) return;
CoreMidiBuffer * buf = static_cast<CoreMidiBuffer*>(port_buffer); CoreMidiBuffer * buf = static_cast<CoreMidiBuffer*>(port_buffer);
assert (buf); assert (buf);
buf->clear (); buf->clear ();
@ -1395,8 +1395,7 @@ CoreAudioBackend::n_physical_inputs () const
void* void*
CoreAudioBackend::get_buffer (PortEngine::PortHandle port, pframes_t nframes) CoreAudioBackend::get_buffer (PortEngine::PortHandle port, pframes_t nframes)
{ {
assert (port); if (!port || !valid_port (port)) return NULL;
assert (valid_port (port));
return static_cast<CoreBackendPort*>(port)->get_buffer (nframes); return static_cast<CoreBackendPort*>(port)->get_buffer (nframes);
} }