diff options
Diffstat (limited to 'src/lib/portmidi/pmlinux.c')
-rw-r--r-- | src/lib/portmidi/pmlinux.c | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/src/lib/portmidi/pmlinux.c b/src/lib/portmidi/pmlinux.c index 4e2196294bb..2443917db04 100644 --- a/src/lib/portmidi/pmlinux.c +++ b/src/lib/portmidi/pmlinux.c @@ -16,11 +16,11 @@ #include "pminternal.h" #ifdef PMALSA - #include "pmlinuxalsa.h" + #include "pmlinuxalsa.h" #endif #ifdef PMNULL - #include "pmlinuxnull.h" + #include "pmlinuxnull.h" #endif PmDeviceID pm_default_input_device_id = -1; @@ -30,46 +30,45 @@ extern PmDeviceID find_default_device(char *path, int input, PmDeviceID id); void pm_init() { - /* Note: it is not an error for PMALSA to fail to initialize. - * It may be a design error that the client cannot query what subsystems - * are working properly other than by looking at the list of available - * devices. - */ - #ifdef PMALSA + /* Note: it is not an error for PMALSA to fail to initialize. + * It may be a design error that the client cannot query what subsystems + * are working properly other than by looking at the list of available + * devices. + */ + #ifdef PMALSA pm_linuxalsa_init(); - #endif - #ifdef PMNULL - pm_linuxnull_init(); - #endif - // this is set when we return to Pm_Initialize, but we need it - // now in order to (successfully) call Pm_CountDevices() - pm_initialized = TRUE; - 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( + #endif + #ifdef PMNULL + pm_linuxnull_init(); + #endif + // this is set when we return to Pm_Initialize, but we need it + // now in order to (successfully) call Pm_CountDevices() + pm_initialized = TRUE; + 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); + pm_default_output_device_id); } void pm_term(void) { - #ifdef PMALSA - pm_linuxalsa_term(); - #endif + #ifdef PMALSA + pm_linuxalsa_term(); + #endif } -PmDeviceID Pm_GetDefaultInputDeviceID() { - Pm_Initialize(); - return pm_default_input_device_id; +PmDeviceID Pm_GetDefaultInputDeviceID() { + Pm_Initialize(); + return pm_default_input_device_id; } -PmDeviceID Pm_GetDefaultOutputDeviceID() { - Pm_Initialize(); - return pm_default_output_device_id; +PmDeviceID Pm_GetDefaultOutputDeviceID() { + Pm_Initialize(); + return pm_default_output_device_id; } void *pm_alloc(size_t s) { return malloc(s); } void pm_free(void *ptr) { free(ptr); } - |