diff --git a/MacOSX/codecs/include/mikmod.h b/MacOSX/codecs/include/mikmod.h index 5819e536..cf876dcb 100644 --- a/MacOSX/codecs/include/mikmod.h +++ b/MacOSX/codecs/include/mikmod.h @@ -1,5 +1,5 @@ /* MikMod sound library - (c) 1998, 1999, 2000 Miodrag Vallat and others - see file AUTHORS + (c) 1998-2014 Miodrag Vallat and others - see the AUTHORS file for complete list. This library is free software; you can redistribute it and/or modify @@ -51,6 +51,12 @@ extern "C" { # else # define MIKMODAPI __declspec(dllimport) /* using libmikmod dll for windows */ # endif +#elif defined(__OS2__) && defined(__WATCOMC__) +# if defined(MIKMOD_BUILD) && defined(__SW_BD) /* building libmikmod as a dll for os/2 */ +# define MIKMODAPI __declspec(dllexport) +# else +# define MIKMODAPI /* using dll or static libmikmod for os/2 */ +# endif /* SYM_VISIBILITY should be defined if both the compiler * and the target support the visibility attributes. the * configury does that automatically. for the standalone @@ -88,51 +94,52 @@ MIKMODAPI extern long MikMod_GetVersion(void); #include #include #include -/* Avoid conflicts with windef.h */ -#define SBYTE _mm_SBYTE -#define UBYTE _mm_UBYTE -#define SWORD _mm_SWORD -#define UWORD _mm_UWORD -#define SLONG _mm_SLONG -#define ULONG _mm_ULONG -#define BOOL _mm_BOOL -#define CHAR _mm_CHAR #endif #if defined(__OS2__)||defined(__EMX__) #define INCL_DOSSEMAPHORES #include -#else -typedef char CHAR; +#include #endif - - -#if defined (_LP64) || defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) -/* 64 bit architectures */ - -typedef signed char SBYTE; /* 1 byte, signed */ -typedef unsigned char UBYTE; /* 1 byte, unsigned */ -typedef signed short SWORD; /* 2 bytes, signed */ -typedef unsigned short UWORD; /* 2 bytes, unsigned */ -typedef signed int SLONG; /* 4 bytes, signed */ -typedef unsigned int ULONG; /* 4 bytes, unsigned */ +#if !defined(__OS2__) && !defined(__EMX__) && !defined(_WIN32) typedef int BOOL; /* 0=false, <>0 true */ +typedef char CHAR; +#endif -#else -/* 32 bit architectures */ + /* 1 byte, signed and unsigned: */ +typedef signed char SBYTE; +typedef unsigned char UBYTE; -typedef signed char SBYTE; /* 1 byte, signed */ -typedef unsigned char UBYTE; /* 1 byte, unsigned */ -typedef signed short SWORD; /* 2 bytes, signed */ -typedef unsigned short UWORD; /* 2 bytes, unsigned */ -typedef signed long SLONG; /* 4 bytes, signed */ -#if !defined(__OS2__)&&!defined(__EMX__) -typedef unsigned long ULONG; /* 4 bytes, unsigned */ -typedef int BOOL; /* 0=false, <>0 true */ +/* 2 bytes, signed and unsigned: */ +typedef signed short SWORD; +typedef unsigned short UWORD; + +/* 4 bytes, signed and unsigned: */ +#if defined(_LP64) || defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) + /* 64 bit architectures: */ +typedef signed int SLONG; +#ifndef _WIN32 +typedef unsigned int ULONG; +#endif + +#else /* 32 bit architectures: */ +typedef signed long SLONG; +#if !defined(__OS2__) && !defined(__EMX__) && !defined(_WIN32) +typedef unsigned long ULONG; #endif #endif +/* make sure types are of correct sizes: */ +typedef int __mikmod_typetest [ + ( + (sizeof(SBYTE)==1) && (sizeof(UBYTE)==1) + && (sizeof(SWORD)==2) && (sizeof(UWORD)==2) + && (sizeof(SLONG)==4) && (sizeof(ULONG)==4) + && (sizeof(BOOL) == sizeof(int)) + && (sizeof(CHAR) == sizeof(char)) + ) * 2 - 1 ]; + /* * ========== Error codes */ @@ -791,7 +798,6 @@ MIKMODAPI extern struct MDRIVER drv_mac; /* Macintosh Sound Manager driver */ 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_wss; /* DOS WSS driver */ diff --git a/MacOSX/codecs/include/mpg123.h b/MacOSX/codecs/include/mpg123.h index 83c97b6c..5d496945 100644 --- a/MacOSX/codecs/include/mpg123.h +++ b/MacOSX/codecs/include/mpg123.h @@ -1,5 +1,5 @@ /* - libmpg123: MPEG Audio Decoder library (version 1.18.1) + libmpg123: MPEG Audio Decoder library (version 1.20.1) copyright 1995-2010 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org @@ -12,7 +12,7 @@ /* A macro to check at compile time which set of API functions to expect. This should be incremented at least each time a new symbol is added to the header. */ -#define MPG123_API_VERSION 39 +#define MPG123_API_VERSION 40 /* These aren't actually in use... seems to work without using libtool. */ #ifdef BUILD_MPG123_DLL @@ -1089,7 +1089,10 @@ EXPORT int mpg123_getpar(mpg123_pars *mp, enum mpg123_parms type, long *val, dou * @{ */ /** Replace default internal buffer with user-supplied buffer. - * Instead of working on it's own private buffer, mpg123 will directly use the one you provide for storing decoded audio. */ + * Instead of working on it's own private buffer, mpg123 will directly use the one you provide for storing decoded audio. + * Note that the required buffer size could be bigger than expected from output + * encoding if libmpg123 has to convert from primary decoder output (p.ex. 32 bit + * storage for 24 bit output. */ EXPORT int mpg123_replace_buffer(mpg123_handle *mh, unsigned char *data, size_t size); /** The max size of one frame's decoded output with current settings. diff --git a/MacOSX/codecs/include/mpg123_config.txt b/MacOSX/codecs/include/mpg123_config.txt index a4c273b7..0c9ae07f 100644 --- a/MacOSX/codecs/include/mpg123_config.txt +++ b/MacOSX/codecs/include/mpg123_config.txt @@ -1,6 +1,5 @@ -mpg123-1.18.1, configured using: ---disable-modules --disable-debug --disable-fifo --disable-ipv6 --disable-network --disable-messages --disable-string --disable-icy --disable-lfs-alias -edited src/config.h and undefined macro WANT_WIN32_UNICODE +mpg123-1.20.1, configured using: +--disable-modules --disable-debug --disable-fifo --disable-ipv6 --disable-network --disable-messages --disable-lfs-alias edited src/libmpg123/mpg123lib_intern.h and changed macros NOQUIET, VERBOSE* and PVERB() to be 0, in order to disable some debug messages from the library. diff --git a/MacOSX/codecs/lib/libmpg123.dylib b/MacOSX/codecs/lib/libmpg123.dylib index 33c04be7..a054fa04 100755 Binary files a/MacOSX/codecs/lib/libmpg123.dylib and b/MacOSX/codecs/lib/libmpg123.dylib differ diff --git a/MacOSX/codecs/lib/libopus.dylib b/MacOSX/codecs/lib/libopus.dylib index b02f49d2..cc8ae143 100755 Binary files a/MacOSX/codecs/lib/libopus.dylib and b/MacOSX/codecs/lib/libopus.dylib differ diff --git a/Windows/codecs/include/mikmod.h b/Windows/codecs/include/mikmod.h index 5819e536..cf876dcb 100644 --- a/Windows/codecs/include/mikmod.h +++ b/Windows/codecs/include/mikmod.h @@ -1,5 +1,5 @@ /* MikMod sound library - (c) 1998, 1999, 2000 Miodrag Vallat and others - see file AUTHORS + (c) 1998-2014 Miodrag Vallat and others - see the AUTHORS file for complete list. This library is free software; you can redistribute it and/or modify @@ -51,6 +51,12 @@ extern "C" { # else # define MIKMODAPI __declspec(dllimport) /* using libmikmod dll for windows */ # endif +#elif defined(__OS2__) && defined(__WATCOMC__) +# if defined(MIKMOD_BUILD) && defined(__SW_BD) /* building libmikmod as a dll for os/2 */ +# define MIKMODAPI __declspec(dllexport) +# else +# define MIKMODAPI /* using dll or static libmikmod for os/2 */ +# endif /* SYM_VISIBILITY should be defined if both the compiler * and the target support the visibility attributes. the * configury does that automatically. for the standalone @@ -88,51 +94,52 @@ MIKMODAPI extern long MikMod_GetVersion(void); #include #include #include -/* Avoid conflicts with windef.h */ -#define SBYTE _mm_SBYTE -#define UBYTE _mm_UBYTE -#define SWORD _mm_SWORD -#define UWORD _mm_UWORD -#define SLONG _mm_SLONG -#define ULONG _mm_ULONG -#define BOOL _mm_BOOL -#define CHAR _mm_CHAR #endif #if defined(__OS2__)||defined(__EMX__) #define INCL_DOSSEMAPHORES #include -#else -typedef char CHAR; +#include #endif - - -#if defined (_LP64) || defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) -/* 64 bit architectures */ - -typedef signed char SBYTE; /* 1 byte, signed */ -typedef unsigned char UBYTE; /* 1 byte, unsigned */ -typedef signed short SWORD; /* 2 bytes, signed */ -typedef unsigned short UWORD; /* 2 bytes, unsigned */ -typedef signed int SLONG; /* 4 bytes, signed */ -typedef unsigned int ULONG; /* 4 bytes, unsigned */ +#if !defined(__OS2__) && !defined(__EMX__) && !defined(_WIN32) typedef int BOOL; /* 0=false, <>0 true */ +typedef char CHAR; +#endif -#else -/* 32 bit architectures */ + /* 1 byte, signed and unsigned: */ +typedef signed char SBYTE; +typedef unsigned char UBYTE; -typedef signed char SBYTE; /* 1 byte, signed */ -typedef unsigned char UBYTE; /* 1 byte, unsigned */ -typedef signed short SWORD; /* 2 bytes, signed */ -typedef unsigned short UWORD; /* 2 bytes, unsigned */ -typedef signed long SLONG; /* 4 bytes, signed */ -#if !defined(__OS2__)&&!defined(__EMX__) -typedef unsigned long ULONG; /* 4 bytes, unsigned */ -typedef int BOOL; /* 0=false, <>0 true */ +/* 2 bytes, signed and unsigned: */ +typedef signed short SWORD; +typedef unsigned short UWORD; + +/* 4 bytes, signed and unsigned: */ +#if defined(_LP64) || defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) + /* 64 bit architectures: */ +typedef signed int SLONG; +#ifndef _WIN32 +typedef unsigned int ULONG; +#endif + +#else /* 32 bit architectures: */ +typedef signed long SLONG; +#if !defined(__OS2__) && !defined(__EMX__) && !defined(_WIN32) +typedef unsigned long ULONG; #endif #endif +/* make sure types are of correct sizes: */ +typedef int __mikmod_typetest [ + ( + (sizeof(SBYTE)==1) && (sizeof(UBYTE)==1) + && (sizeof(SWORD)==2) && (sizeof(UWORD)==2) + && (sizeof(SLONG)==4) && (sizeof(ULONG)==4) + && (sizeof(BOOL) == sizeof(int)) + && (sizeof(CHAR) == sizeof(char)) + ) * 2 - 1 ]; + /* * ========== Error codes */ @@ -791,7 +798,6 @@ MIKMODAPI extern struct MDRIVER drv_mac; /* Macintosh Sound Manager driver */ 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_wss; /* DOS WSS driver */ diff --git a/Windows/codecs/include/mpg123.h b/Windows/codecs/include/mpg123.h index 83c97b6c..5d496945 100644 --- a/Windows/codecs/include/mpg123.h +++ b/Windows/codecs/include/mpg123.h @@ -1,5 +1,5 @@ /* - libmpg123: MPEG Audio Decoder library (version 1.18.1) + libmpg123: MPEG Audio Decoder library (version 1.20.1) copyright 1995-2010 by the mpg123 project - free software under the terms of the LGPL 2.1 see COPYING and AUTHORS files in distribution or http://mpg123.org @@ -12,7 +12,7 @@ /* A macro to check at compile time which set of API functions to expect. This should be incremented at least each time a new symbol is added to the header. */ -#define MPG123_API_VERSION 39 +#define MPG123_API_VERSION 40 /* These aren't actually in use... seems to work without using libtool. */ #ifdef BUILD_MPG123_DLL @@ -1089,7 +1089,10 @@ EXPORT int mpg123_getpar(mpg123_pars *mp, enum mpg123_parms type, long *val, dou * @{ */ /** Replace default internal buffer with user-supplied buffer. - * Instead of working on it's own private buffer, mpg123 will directly use the one you provide for storing decoded audio. */ + * Instead of working on it's own private buffer, mpg123 will directly use the one you provide for storing decoded audio. + * Note that the required buffer size could be bigger than expected from output + * encoding if libmpg123 has to convert from primary decoder output (p.ex. 32 bit + * storage for 24 bit output. */ EXPORT int mpg123_replace_buffer(mpg123_handle *mh, unsigned char *data, size_t size); /** The max size of one frame's decoded output with current settings. diff --git a/Windows/codecs/include/mpg123_config.txt b/Windows/codecs/include/mpg123_config.txt index a4c273b7..0c9ae07f 100644 --- a/Windows/codecs/include/mpg123_config.txt +++ b/Windows/codecs/include/mpg123_config.txt @@ -1,6 +1,5 @@ -mpg123-1.18.1, configured using: ---disable-modules --disable-debug --disable-fifo --disable-ipv6 --disable-network --disable-messages --disable-string --disable-icy --disable-lfs-alias -edited src/config.h and undefined macro WANT_WIN32_UNICODE +mpg123-1.20.1, configured using: +--disable-modules --disable-debug --disable-fifo --disable-ipv6 --disable-network --disable-messages --disable-lfs-alias edited src/libmpg123/mpg123lib_intern.h and changed macros NOQUIET, VERBOSE* and PVERB() to be 0, in order to disable some debug messages from the library. diff --git a/Windows/codecs/x64/libmpg123-0.dll b/Windows/codecs/x64/libmpg123-0.dll index 69a47fd1..ed1bc8d3 100644 Binary files a/Windows/codecs/x64/libmpg123-0.dll and b/Windows/codecs/x64/libmpg123-0.dll differ diff --git a/Windows/codecs/x64/libmpg123.dll.a b/Windows/codecs/x64/libmpg123.dll.a index f22993b4..0990a5a9 100644 Binary files a/Windows/codecs/x64/libmpg123.dll.a and b/Windows/codecs/x64/libmpg123.dll.a differ diff --git a/Windows/codecs/x64/libmpg123.lib b/Windows/codecs/x64/libmpg123.lib index eaadbb95..966f1f89 100644 Binary files a/Windows/codecs/x64/libmpg123.lib and b/Windows/codecs/x64/libmpg123.lib differ diff --git a/Windows/codecs/x64/libopus-0.dll b/Windows/codecs/x64/libopus-0.dll index c16fea30..ec37b8cb 100644 Binary files a/Windows/codecs/x64/libopus-0.dll and b/Windows/codecs/x64/libopus-0.dll differ diff --git a/Windows/codecs/x86/libmpg123-0.dll b/Windows/codecs/x86/libmpg123-0.dll index e5083349..c13c2857 100644 Binary files a/Windows/codecs/x86/libmpg123-0.dll and b/Windows/codecs/x86/libmpg123-0.dll differ diff --git a/Windows/codecs/x86/libmpg123.dll.a b/Windows/codecs/x86/libmpg123.dll.a index 050dcbb1..44881ebb 100644 Binary files a/Windows/codecs/x86/libmpg123.dll.a and b/Windows/codecs/x86/libmpg123.dll.a differ diff --git a/Windows/codecs/x86/libmpg123.lib b/Windows/codecs/x86/libmpg123.lib index b028ad2a..e9482688 100644 Binary files a/Windows/codecs/x86/libmpg123.lib and b/Windows/codecs/x86/libmpg123.lib differ diff --git a/Windows/codecs/x86/libopus-0.dll b/Windows/codecs/x86/libopus-0.dll index a918850e..9786c011 100644 Binary files a/Windows/codecs/x86/libopus-0.dll and b/Windows/codecs/x86/libopus-0.dll differ