diff --git a/MacOSX/codecs/include/mikmod.h b/MacOSX/codecs/include/mikmod.h index ad28735e..756373d3 100644 --- a/MacOSX/codecs/include/mikmod.h +++ b/MacOSX/codecs/include/mikmod.h @@ -74,7 +74,7 @@ extern "C" { #define LIBMIKMOD_VERSION_MAJOR 3L #define LIBMIKMOD_VERSION_MINOR 3L -#define LIBMIKMOD_REVISION 6L +#define LIBMIKMOD_REVISION 8L #define LIBMIKMOD_VERSION \ ((LIBMIKMOD_VERSION_MAJOR<<16)| \ @@ -288,6 +288,9 @@ enum { MMERR_ALSA_PCM_WRITE, MMERR_ALSA_PCM_RECOVER, + MMERR_SNDIO_SETPARAMS, + MMERR_SNDIO_BADPARAMS, + MMERR_MAX }; @@ -803,6 +806,7 @@ MIKMODAPI extern struct MDRIVER drv_ultra; /* Linux Ultrasound driver */ MIKMODAPI extern struct MDRIVER drv_sam9407;/* Linux sam9407 driver */ MIKMODAPI extern struct MDRIVER drv_AF; /* Dec Alpha AudioFile */ +MIKMODAPI extern struct MDRIVER drv_ahi; /* Amiga AHI */ MIKMODAPI extern struct MDRIVER drv_aix; /* AIX audio device */ MIKMODAPI extern struct MDRIVER drv_alsa; /* Advanced Linux Sound Architecture (ALSA) */ MIKMODAPI extern struct MDRIVER drv_esd; /* Enlightened sound daemon (EsounD) */ @@ -813,6 +817,7 @@ MIKMODAPI extern struct MDRIVER drv_oss; /* OpenSound System (Linux,FreeBSD.. MIKMODAPI extern struct MDRIVER drv_openal; /* OpenAL driver */ MIKMODAPI extern struct MDRIVER drv_sdl; /* SDL audio driver */ MIKMODAPI extern struct MDRIVER drv_sgi; /* SGI audio library */ +MIKMODAPI extern struct MDRIVER drv_sndio; /* OpenBSD sndio */ MIKMODAPI extern struct MDRIVER drv_sun; /* Sun/NetBSD/OpenBSD audio device */ MIKMODAPI extern struct MDRIVER drv_dart; /* OS/2 Direct Audio RealTime */ @@ -827,10 +832,13 @@ MIKMODAPI extern struct MDRIVER drv_osx; /* MacOS X CoreAudio Driver */ MIKMODAPI extern struct MDRIVER drv_dc; /* Dreamcast driver */ MIKMODAPI extern struct MDRIVER drv_gp32; /* GP32 Sound driver */ +MIKMODAPI extern struct MDRIVER drv_psp; /* PlayStation Portable driver */ MIKMODAPI extern struct MDRIVER drv_wss; /* DOS WSS driver */ MIKMODAPI extern struct MDRIVER drv_sb; /* DOS S/B driver */ +MIKMODAPI extern struct MDRIVER drv_osles; /* OpenSL ES driver for android */ + /*========== Virtual channel mixer interface (for user-supplied drivers only) */ MIKMODAPI extern int VC_Init(void); diff --git a/MacOSX/codecs/include/mikmod_config.txt b/MacOSX/codecs/include/mikmod_config.txt index c2a1b763..d55cd9f4 100644 --- a/MacOSX/codecs/include/mikmod_config.txt +++ b/MacOSX/codecs/include/mikmod_config.txt @@ -1,4 +1,4 @@ -libmikmod-3.3.6 +libmikmod-3.3.8 (mercurial repo as of 2014-12-28) only the "nosound" driver (drv_nos) is included, all of the other libmikmod drivers were made "MISSING" drivers. we only need/register/use drv_nos here and nothing else. diff --git a/MacOSX/codecs/include/modplug_config.txt b/MacOSX/codecs/include/modplug_config.txt index 5704c7a0..dd94dd2c 100644 --- a/MacOSX/codecs/include/modplug_config.txt +++ b/MacOSX/codecs/include/modplug_config.txt @@ -1,4 +1,4 @@ -libmodplug - v0.8.8.5 release + git (2014-07-28) using sezero's fork +libmodplug - v0.8.8.5 release + git (2014-11-27) using sezero's fork at https://github.com/sezero/libmodplug/ midi formats (*.abc, *.mid) and GUS patches (*.pat) loading disabled. diff --git a/MacOSX/codecs/lib/libmikmod.dylib b/MacOSX/codecs/lib/libmikmod.dylib index ee3fd2bf..e425c966 100755 Binary files a/MacOSX/codecs/lib/libmikmod.dylib and b/MacOSX/codecs/lib/libmikmod.dylib differ diff --git a/MacOSX/codecs/lib/libmodplug.dylib b/MacOSX/codecs/lib/libmodplug.dylib index 72e2f2ca..5690d3ef 100755 Binary files a/MacOSX/codecs/lib/libmodplug.dylib and b/MacOSX/codecs/lib/libmodplug.dylib differ diff --git a/MacOSX/codecs/lib/libvorbis.dylib b/MacOSX/codecs/lib/libvorbis.dylib index 6ccfe963..b6b3b37d 100755 Binary files a/MacOSX/codecs/lib/libvorbis.dylib and b/MacOSX/codecs/lib/libvorbis.dylib differ diff --git a/MacOSX/codecs/lib/libvorbisfile.dylib b/MacOSX/codecs/lib/libvorbisfile.dylib index ea31f007..76b885c0 100755 Binary files a/MacOSX/codecs/lib/libvorbisfile.dylib and b/MacOSX/codecs/lib/libvorbisfile.dylib differ diff --git a/Windows/codecs/include/mikmod.h b/Windows/codecs/include/mikmod.h index ad28735e..756373d3 100644 --- a/Windows/codecs/include/mikmod.h +++ b/Windows/codecs/include/mikmod.h @@ -74,7 +74,7 @@ extern "C" { #define LIBMIKMOD_VERSION_MAJOR 3L #define LIBMIKMOD_VERSION_MINOR 3L -#define LIBMIKMOD_REVISION 6L +#define LIBMIKMOD_REVISION 8L #define LIBMIKMOD_VERSION \ ((LIBMIKMOD_VERSION_MAJOR<<16)| \ @@ -288,6 +288,9 @@ enum { MMERR_ALSA_PCM_WRITE, MMERR_ALSA_PCM_RECOVER, + MMERR_SNDIO_SETPARAMS, + MMERR_SNDIO_BADPARAMS, + MMERR_MAX }; @@ -803,6 +806,7 @@ MIKMODAPI extern struct MDRIVER drv_ultra; /* Linux Ultrasound driver */ MIKMODAPI extern struct MDRIVER drv_sam9407;/* Linux sam9407 driver */ MIKMODAPI extern struct MDRIVER drv_AF; /* Dec Alpha AudioFile */ +MIKMODAPI extern struct MDRIVER drv_ahi; /* Amiga AHI */ MIKMODAPI extern struct MDRIVER drv_aix; /* AIX audio device */ MIKMODAPI extern struct MDRIVER drv_alsa; /* Advanced Linux Sound Architecture (ALSA) */ MIKMODAPI extern struct MDRIVER drv_esd; /* Enlightened sound daemon (EsounD) */ @@ -813,6 +817,7 @@ MIKMODAPI extern struct MDRIVER drv_oss; /* OpenSound System (Linux,FreeBSD.. MIKMODAPI extern struct MDRIVER drv_openal; /* OpenAL driver */ MIKMODAPI extern struct MDRIVER drv_sdl; /* SDL audio driver */ MIKMODAPI extern struct MDRIVER drv_sgi; /* SGI audio library */ +MIKMODAPI extern struct MDRIVER drv_sndio; /* OpenBSD sndio */ MIKMODAPI extern struct MDRIVER drv_sun; /* Sun/NetBSD/OpenBSD audio device */ MIKMODAPI extern struct MDRIVER drv_dart; /* OS/2 Direct Audio RealTime */ @@ -827,10 +832,13 @@ MIKMODAPI extern struct MDRIVER drv_osx; /* MacOS X CoreAudio Driver */ MIKMODAPI extern struct MDRIVER drv_dc; /* Dreamcast driver */ MIKMODAPI extern struct MDRIVER drv_gp32; /* GP32 Sound driver */ +MIKMODAPI extern struct MDRIVER drv_psp; /* PlayStation Portable driver */ MIKMODAPI extern struct MDRIVER drv_wss; /* DOS WSS driver */ MIKMODAPI extern struct MDRIVER drv_sb; /* DOS S/B driver */ +MIKMODAPI extern struct MDRIVER drv_osles; /* OpenSL ES driver for android */ + /*========== Virtual channel mixer interface (for user-supplied drivers only) */ MIKMODAPI extern int VC_Init(void); diff --git a/Windows/codecs/include/mikmod_config.txt b/Windows/codecs/include/mikmod_config.txt index c2a1b763..d55cd9f4 100644 --- a/Windows/codecs/include/mikmod_config.txt +++ b/Windows/codecs/include/mikmod_config.txt @@ -1,4 +1,4 @@ -libmikmod-3.3.6 +libmikmod-3.3.8 (mercurial repo as of 2014-12-28) only the "nosound" driver (drv_nos) is included, all of the other libmikmod drivers were made "MISSING" drivers. we only need/register/use drv_nos here and nothing else. diff --git a/Windows/codecs/include/modplug_config.txt b/Windows/codecs/include/modplug_config.txt index e646ab8f..2031d60d 100644 --- a/Windows/codecs/include/modplug_config.txt +++ b/Windows/codecs/include/modplug_config.txt @@ -1,4 +1,4 @@ -libmodplug - v0.8.8.5 release + git (2014-07-28) using sezero's fork +libmodplug - v0.8.8.5 release + git (2014-11-27) using sezero's fork at https://github.com/sezero/libmodplug/ midi formats (*.abc, *.mid) and GUS patches (*.pat) loading disabled. diff --git a/Windows/codecs/x64/libmikmod-3.dll b/Windows/codecs/x64/libmikmod-3.dll index 69753ad7..9b115022 100644 Binary files a/Windows/codecs/x64/libmikmod-3.dll and b/Windows/codecs/x64/libmikmod-3.dll differ diff --git a/Windows/codecs/x64/libmodplug-1.dll b/Windows/codecs/x64/libmodplug-1.dll index 5816c8d4..301eb245 100644 Binary files a/Windows/codecs/x64/libmodplug-1.dll and b/Windows/codecs/x64/libmodplug-1.dll differ diff --git a/Windows/codecs/x64/libvorbis-0.dll b/Windows/codecs/x64/libvorbis-0.dll index 53a1713c..d1482ff8 100644 Binary files a/Windows/codecs/x64/libvorbis-0.dll and b/Windows/codecs/x64/libvorbis-0.dll differ diff --git a/Windows/codecs/x64/libvorbisfile-3.dll b/Windows/codecs/x64/libvorbisfile-3.dll index 5b5f3e35..d46e4dfc 100644 Binary files a/Windows/codecs/x64/libvorbisfile-3.dll and b/Windows/codecs/x64/libvorbisfile-3.dll differ diff --git a/Windows/codecs/x86/libmikmod-3.dll b/Windows/codecs/x86/libmikmod-3.dll index dfc0c6d5..586f040e 100644 Binary files a/Windows/codecs/x86/libmikmod-3.dll and b/Windows/codecs/x86/libmikmod-3.dll differ diff --git a/Windows/codecs/x86/libmodplug-1.dll b/Windows/codecs/x86/libmodplug-1.dll index fb504c14..4f1a0c1d 100644 Binary files a/Windows/codecs/x86/libmodplug-1.dll and b/Windows/codecs/x86/libmodplug-1.dll differ diff --git a/Windows/codecs/x86/libvorbis-0.dll b/Windows/codecs/x86/libvorbis-0.dll index 582296fa..fb933c6a 100644 Binary files a/Windows/codecs/x86/libvorbis-0.dll and b/Windows/codecs/x86/libvorbis-0.dll differ diff --git a/Windows/codecs/x86/libvorbisfile-3.dll b/Windows/codecs/x86/libvorbisfile-3.dll index 2112efea..c40a9a96 100644 Binary files a/Windows/codecs/x86/libvorbisfile-3.dll and b/Windows/codecs/x86/libvorbisfile-3.dll differ