diff options
Diffstat (limited to 'src/lib/portmidi/pmmac.c')
-rw-r--r-- | src/lib/portmidi/pmmac.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/src/lib/portmidi/pmmac.c b/src/lib/portmidi/pmmac.c index 427c0378ea3..5468b8d5596 100644 --- a/src/lib/portmidi/pmmac.c +++ b/src/lib/portmidi/pmmac.c @@ -1,7 +1,7 @@ /* pmmac.c -- PortMidi os-dependent code */ /* This file only needs to implement: -pm_init(), which calls various routines to register the +pm_init(), which calls various routines to register the available midi devices, Pm_GetDefaultInputDeviceID(), and Pm_GetDefaultOutputDeviceID(). @@ -20,40 +20,38 @@ PmDeviceID pm_default_output_device_id = -1; void pm_init() { - PmError err = pm_macosxcm_init(); - // this is set when we return to Pm_Initialize, but we need it - // now in order to (successfully) call Pm_CountDevices() - pm_initialized = TRUE; - if (!err) { - pm_default_input_device_id = find_default_device( - (char *)"/PortMidi/PM_RECOMMENDED_INPUT_DEVICE", TRUE, - pm_default_input_device_id); - pm_default_output_device_id = find_default_device( - (char *)"/PortMidi/PM_RECOMMENDED_OUTPUT_DEVICE", FALSE, - pm_default_output_device_id); - } + PmError err = pm_macosxcm_init(); + // this is set when we return to Pm_Initialize, but we need it + // now in order to (successfully) call Pm_CountDevices() + pm_initialized = TRUE; + if (!err) { + pm_default_input_device_id = find_default_device( + (char *)"/PortMidi/PM_RECOMMENDED_INPUT_DEVICE", TRUE, + pm_default_input_device_id); + pm_default_output_device_id = find_default_device( + (char *)"/PortMidi/PM_RECOMMENDED_OUTPUT_DEVICE", FALSE, + pm_default_output_device_id); + } } void pm_term(void) { - pm_macosxcm_term(); + pm_macosxcm_term(); } PmDeviceID Pm_GetDefaultInputDeviceID() { - Pm_Initialize(); - return pm_default_input_device_id; + Pm_Initialize(); + return pm_default_input_device_id; } PmDeviceID Pm_GetDefaultOutputDeviceID() { - Pm_Initialize(); - return pm_default_output_device_id; + Pm_Initialize(); + return pm_default_output_device_id; } void *pm_alloc(size_t s) { return malloc(s); } void pm_free(void *ptr) { free(ptr); } - - |