summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2025-04-20 11:02:29 +1000
committer Vas Crabb <vas@vastheman.com>2025-04-20 11:02:29 +1000
commit53cd382d4a123868960a6067e5b5cb5a6c96a0e0 (patch)
treef79dfef7ace17712a713b1494b9e8fc7e879ded0 /3rdparty
parentfd2ff424591bae1a79d5f0e8885ac66b1426d8f2 (diff)
3rdparty/portmidi: Fixed more macOS errors.
Diffstat (limited to '3rdparty')
-rw-r--r--3rdparty/portmidi/pm_mac/pmmacosxcm.c6
-rw-r--r--3rdparty/portmidi/pm_win/pmwinmm.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/3rdparty/portmidi/pm_mac/pmmacosxcm.c b/3rdparty/portmidi/pm_mac/pmmacosxcm.c
index d6bcdcd54d4..d6f0b86ba53 100644
--- a/3rdparty/portmidi/pm_mac/pmmacosxcm.c
+++ b/3rdparty/portmidi/pm_mac/pmmacosxcm.c
@@ -519,7 +519,7 @@ static PmError midi_in_open(PmInternal *midi, void *driverInfo)
{
MIDIEndpointRef endpoint;
coremidi_info_type info;
- OSStatus macHostError;
+ OSStatus macHostError = noErr;
int is_virtual = pm_descriptors[midi->device_id].pub.is_virtual;
/* if this is an external device, descriptor is a MIDIEndpointRef.
@@ -771,7 +771,7 @@ static PmError send_packet(PmInternal *midi, Byte *message,
info->packet = MIDIPacketListAdd(info->packetList,
sizeof(info->packetBuffer), info->packet,
timestamp, messageLength, message);
-#if LIMIT_SEND_RATE
+#if defined(LIMIT_SEND_RATE) && (LIMIT_SEND_RATE != 0)
info->byte_count += messageLength;
#endif
if (info->packet == NULL) {
@@ -1201,7 +1201,7 @@ PmError pm_macosxcm_init(void)
MIDIEndpointRef endpoint;
int i;
OSStatus macHostError = noErr;
- char *error_text;
+ const char *error_text;
memset(isIAC, 0, sizeof(isIAC)); /* initialize all FALSE */
diff --git a/3rdparty/portmidi/pm_win/pmwinmm.c b/3rdparty/portmidi/pm_win/pmwinmm.c
index d04fbedbaad..dfe0255ac22 100644
--- a/3rdparty/portmidi/pm_win/pmwinmm.c
+++ b/3rdparty/portmidi/pm_win/pmwinmm.c
@@ -988,7 +988,7 @@ static PmError winmm_write_byte(PmInternal *midi, unsigned char byte,
info->hdr = hdr = get_free_output_buffer(midi);
assert(hdr);
midi->fill_base = (unsigned char *) info->hdr->lpData;
- midi->fill_offset_ptr = (unsigned int *) &(hdr->dwBytesRecorded);
+ midi->fill_offset_ptr = (uint32_t *) &(hdr->dwBytesRecorded);
/* when buffer fills, Pm_WriteSysEx will revert to calling
* pmwin_write_byte, which expect to have space, so leave
* one byte free for pmwin_write_byte. Leave another byte