diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e45a84..ee8c6b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: container: image: devkitpro/devkitppc:latest env: - GRRLIBVERS: 4.5.0 + GRRLIBVERS: 4.5.1 steps: diff --git a/GRRMOD/mikmod/include/mikmod.h b/GRRMOD/mikmod/include/mikmod.h index f26e154..c0097df 100644 --- a/GRRMOD/mikmod/include/mikmod.h +++ b/GRRMOD/mikmod/include/mikmod.h @@ -250,14 +250,14 @@ enum { MMERR_MAC_SPEED, MMERR_MAC_START, - MMERR_OSX_UNKNOWN_DEVICE, - MMERR_OSX_BAD_PROPERTY, + MMERR_OSX_UNKNOWN_DEVICE, /* obsolete */ + MMERR_OSX_BAD_PROPERTY, /* obsolete */ MMERR_OSX_UNSUPPORTED_FORMAT, - MMERR_OSX_SET_STEREO, - MMERR_OSX_BUFFER_ALLOC, - MMERR_OSX_ADD_IO_PROC, + MMERR_OSX_SET_STEREO, /* obsolete */ + MMERR_OSX_BUFFER_ALLOC, /* obsolete */ + MMERR_OSX_ADD_IO_PROC, /* obsolete */ MMERR_OSX_DEVICE_START, - MMERR_OSX_PTHREAD, + MMERR_OSX_PTHREAD, /* obsolete */ MMERR_DOSWSS_STARTDMA, MMERR_DOSSB_STARTDMA, diff --git a/GRRMOD/mikmod/mmio/mmerror.c b/GRRMOD/mikmod/mmio/mmerror.c index cf4c99e..e8e4db8 100644 --- a/GRRMOD/mikmod/mmio/mmerror.c +++ b/GRRMOD/mikmod/mmio/mmerror.c @@ -202,14 +202,14 @@ static const char *_mm_errmsg[MMERR_MAX+1] = /* MacOS X/Darwin driver errors */ #ifdef DRV_OSX - "Unknown device", - "Bad property", + _mmerr_invalid, + _mmerr_invalid, "Could not set playback format", - "Could not set mono/stereo setting", - "Could not create playback buffers", - "Could not create playback thread", + _mmerr_invalid, + _mmerr_invalid, + _mmerr_invalid, "Could not start audio device", - "Could not create buffer thread", + _mmerr_invalid, #else _mmerr_invalid, _mmerr_invalid, _mmerr_invalid, _mmerr_invalid, _mmerr_invalid, _mmerr_invalid,