diff --git a/MacOSX/codecs/include/mikmod.h b/MacOSX/codecs/include/mikmod.h index 9218529f..7822a74d 100644 --- a/MacOSX/codecs/include/mikmod.h +++ b/MacOSX/codecs/include/mikmod.h @@ -134,10 +134,10 @@ typedef unsigned char UBYTE; #endif /* 2 bytes, signed and unsigned: */ -#ifndef __LCC__ +#if !(defined __LCC__ && defined _WIN32) typedef signed short int SWORD; #endif -#if !(defined(__LCC__) || defined(_MIKMOD_AMIGA)) +#if !((defined __LCC__ && defined _WIN32) || defined(_MIKMOD_AMIGA)) typedef unsigned short int UWORD; #endif diff --git a/MacOSX/codecs/include/xmp.h b/MacOSX/codecs/include/xmp.h index c974812e..8ec6deeb 100644 --- a/MacOSX/codecs/include/xmp.h +++ b/MacOSX/codecs/include/xmp.h @@ -5,11 +5,11 @@ extern "C" { #endif -#define XMP_VERSION "4.4.2" -#define XMP_VERCODE 0x040402 +#define XMP_VERSION "4.5.0" +#define XMP_VERCODE 0x040500 #define XMP_VER_MAJOR 4 -#define XMP_VER_MINOR 4 -#define XMP_VER_RELEASE 2 +#define XMP_VER_MINOR 5 +#define XMP_VER_RELEASE 0 #if defined(_WIN32) && !defined(__CYGWIN__) # if defined(BUILDING_STATIC) @@ -333,6 +333,8 @@ LIBXMP_EXPORT char **xmp_get_format_list (void); LIBXMP_EXPORT int xmp_next_position (xmp_context); LIBXMP_EXPORT int xmp_prev_position (xmp_context); LIBXMP_EXPORT int xmp_set_position (xmp_context, int); +LIBXMP_EXPORT int xmp_set_row (xmp_context, int); +LIBXMP_EXPORT int xmp_set_tempo_factor(xmp_context, double); LIBXMP_EXPORT void xmp_stop_module (xmp_context); LIBXMP_EXPORT void xmp_restart_module (xmp_context); LIBXMP_EXPORT int xmp_seek_time (xmp_context, int); diff --git a/MacOSX/codecs/lib/libvorbis.dylib b/MacOSX/codecs/lib/libvorbis.dylib index 57b58c17..06575941 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 4a3d9aae..a355dc51 100755 Binary files a/MacOSX/codecs/lib/libvorbisfile.dylib and b/MacOSX/codecs/lib/libvorbisfile.dylib differ diff --git a/MacOSX/codecs/lib/libxmp.dylib b/MacOSX/codecs/lib/libxmp.dylib index 27220d82..ef0d97fa 100755 Binary files a/MacOSX/codecs/lib/libxmp.dylib and b/MacOSX/codecs/lib/libxmp.dylib differ diff --git a/Windows/codecs/include/mikmod.h b/Windows/codecs/include/mikmod.h index 9218529f..7822a74d 100644 --- a/Windows/codecs/include/mikmod.h +++ b/Windows/codecs/include/mikmod.h @@ -134,10 +134,10 @@ typedef unsigned char UBYTE; #endif /* 2 bytes, signed and unsigned: */ -#ifndef __LCC__ +#if !(defined __LCC__ && defined _WIN32) typedef signed short int SWORD; #endif -#if !(defined(__LCC__) || defined(_MIKMOD_AMIGA)) +#if !((defined __LCC__ && defined _WIN32) || defined(_MIKMOD_AMIGA)) typedef unsigned short int UWORD; #endif diff --git a/Windows/codecs/include/xmp.h b/Windows/codecs/include/xmp.h index c974812e..8ec6deeb 100644 --- a/Windows/codecs/include/xmp.h +++ b/Windows/codecs/include/xmp.h @@ -5,11 +5,11 @@ extern "C" { #endif -#define XMP_VERSION "4.4.2" -#define XMP_VERCODE 0x040402 +#define XMP_VERSION "4.5.0" +#define XMP_VERCODE 0x040500 #define XMP_VER_MAJOR 4 -#define XMP_VER_MINOR 4 -#define XMP_VER_RELEASE 2 +#define XMP_VER_MINOR 5 +#define XMP_VER_RELEASE 0 #if defined(_WIN32) && !defined(__CYGWIN__) # if defined(BUILDING_STATIC) @@ -333,6 +333,8 @@ LIBXMP_EXPORT char **xmp_get_format_list (void); LIBXMP_EXPORT int xmp_next_position (xmp_context); LIBXMP_EXPORT int xmp_prev_position (xmp_context); LIBXMP_EXPORT int xmp_set_position (xmp_context, int); +LIBXMP_EXPORT int xmp_set_row (xmp_context, int); +LIBXMP_EXPORT int xmp_set_tempo_factor(xmp_context, double); LIBXMP_EXPORT void xmp_stop_module (xmp_context); LIBXMP_EXPORT void xmp_restart_module (xmp_context); LIBXMP_EXPORT int xmp_seek_time (xmp_context, int); diff --git a/Windows/codecs/x64/libvorbisfile-3.dll b/Windows/codecs/x64/libvorbisfile-3.dll index 06c915d0..1f76ad41 100644 Binary files a/Windows/codecs/x64/libvorbisfile-3.dll and b/Windows/codecs/x64/libvorbisfile-3.dll differ diff --git a/Windows/codecs/x64/libxmp.dll b/Windows/codecs/x64/libxmp.dll index d7bf7506..3ab0c29b 100644 Binary files a/Windows/codecs/x64/libxmp.dll and b/Windows/codecs/x64/libxmp.dll differ diff --git a/Windows/codecs/x64/libxmp.dll.a b/Windows/codecs/x64/libxmp.dll.a index 28f8f178..37c2ca29 100644 Binary files a/Windows/codecs/x64/libxmp.dll.a and b/Windows/codecs/x64/libxmp.dll.a differ diff --git a/Windows/codecs/x64/libxmp.lib b/Windows/codecs/x64/libxmp.lib index c3d388a0..1dbfed33 100644 Binary files a/Windows/codecs/x64/libxmp.lib and b/Windows/codecs/x64/libxmp.lib differ diff --git a/Windows/codecs/x86-watcom/libxmp.lib b/Windows/codecs/x86-watcom/libxmp.lib index de24af8d..0e916e16 100644 Binary files a/Windows/codecs/x86-watcom/libxmp.lib and b/Windows/codecs/x86-watcom/libxmp.lib differ diff --git a/Windows/codecs/x86-watcom/mikmod.lib b/Windows/codecs/x86-watcom/mikmod.lib index b66a2f3e..f52c467c 100644 Binary files a/Windows/codecs/x86-watcom/mikmod.lib and b/Windows/codecs/x86-watcom/mikmod.lib differ diff --git a/Windows/codecs/x86-watcom/vorbisfile.lib b/Windows/codecs/x86-watcom/vorbisfile.lib index 30b515c3..c6a0a484 100644 Binary files a/Windows/codecs/x86-watcom/vorbisfile.lib and b/Windows/codecs/x86-watcom/vorbisfile.lib differ diff --git a/Windows/codecs/x86/libvorbisfile-3.dll b/Windows/codecs/x86/libvorbisfile-3.dll index f259eb26..72968857 100644 Binary files a/Windows/codecs/x86/libvorbisfile-3.dll and b/Windows/codecs/x86/libvorbisfile-3.dll differ diff --git a/Windows/codecs/x86/libxmp.dll b/Windows/codecs/x86/libxmp.dll index c4e0fc60..06064ed2 100644 Binary files a/Windows/codecs/x86/libxmp.dll and b/Windows/codecs/x86/libxmp.dll differ diff --git a/Windows/codecs/x86/libxmp.dll.a b/Windows/codecs/x86/libxmp.dll.a index 7d25914a..e9919783 100644 Binary files a/Windows/codecs/x86/libxmp.dll.a and b/Windows/codecs/x86/libxmp.dll.a differ diff --git a/Windows/codecs/x86/libxmp.lib b/Windows/codecs/x86/libxmp.lib index eb373f7d..0b809066 100644 Binary files a/Windows/codecs/x86/libxmp.lib and b/Windows/codecs/x86/libxmp.lib differ