diff --git a/MacOSX/codecs/include/opus/opusfile.h b/MacOSX/codecs/include/opus/opusfile.h index 220ac7f7..296d8d9a 100644 --- a/MacOSX/codecs/include/opus/opusfile.h +++ b/MacOSX/codecs/include/opus/opusfile.h @@ -6,7 +6,7 @@ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * * THE libopusfile SOURCE CODE IS (C) COPYRIGHT 1994-2012 * - * by the Xiph.Org Foundation and contributors http://www.xiph.org/ * + * by the Xiph.Org Foundation and contributors https://xiph.org/ * * * ******************************************************************** @@ -28,7 +28,7 @@ reference libogg and - libopus + libopus libraries. libopusfile provides several sets of built-in routines for @@ -58,7 +58,7 @@ it is stored in the header to allow you to resample to it after decoding (the libopusfile API does not currently provide a resampler, but the - the + the Speex resampler is a good choice if you need one). In general, if you are playing back the audio, you should leave it at 48 kHz, provided your audio hardware supports it. @@ -68,7 +68,7 @@ Opus files can contain anywhere from 1 to 255 channels of audio. The channel mappings for up to 8 channels are the same as the - Vorbis + Vorbis mappings. A special stereo API can convert everything to 2 channels, making it simple to support multichannel files in an application which only has stereo @@ -284,7 +284,7 @@ struct OpusHead{ A particular tag may occur more than once, and order is significant. The character set encoding for the strings is always UTF-8, but the tag names are limited to ASCII, and treated as case-insensitive. - See the Vorbis + See the Vorbis comment header specification for details. In filling in this structure, libopusfile will null-terminate the @@ -698,7 +698,7 @@ void opus_picture_tag_clear(OpusPictureTag *_pic) OP_ARG_NONNULL(1); #define OP_HTTP_PROXY_PASS_REQUEST (6720) #define OP_GET_SERVER_INFO_REQUEST (6784) -#define OP_URL_OPT(_request) ((_request)+(char *)0) +#define OP_URL_OPT(_request) ((char *)(_request)) /*These macros trigger compilation errors or warnings if the wrong types are provided to one of the URL options.*/ @@ -1890,7 +1890,7 @@ void op_set_dither_enabled(OggOpusFile *_of,int _enabled) OP_ARG_NONNULL(1); signed native-endian 16-bit values at 48 kHz with a nominal range of [-32768,32767). Multiple channels are interleaved using the - Vorbis + Vorbis channel ordering. This must have room for at least \a _buf_size values. \param _buf_size The number of values that can be stored in \a _pcm. @@ -1972,7 +1972,7 @@ OP_WARN_UNUSED_RESULT int op_read(OggOpusFile *_of, signed floats at 48 kHz with a nominal range of [-1.0,1.0]. Multiple channels are interleaved using the - Vorbis + Vorbis channel ordering. This must have room for at least \a _buf_size floats. \param _buf_size The number of floats that can be stored in \a _pcm. diff --git a/MacOSX/codecs/include/xmp.h b/MacOSX/codecs/include/xmp.h index 9c8aebcf..2d725411 100644 --- a/MacOSX/codecs/include/xmp.h +++ b/MacOSX/codecs/include/xmp.h @@ -320,18 +320,37 @@ struct xmp_frame_info { /* Current frame information */ struct xmp_channel_info channel_info[XMP_MAX_CHANNELS]; /* Current channel information */ }; +struct xmp_callbacks { + unsigned long (*read_func)(void *dest, unsigned long len, + unsigned long nmemb, void *priv); + int (*seek_func)(void *priv, long offset, int whence); + long (*tell_func)(void *priv); + int (*close_func)(void *priv); +}; typedef char *xmp_context; LIBXMP_EXPORT_VAR extern const char *xmp_version; LIBXMP_EXPORT_VAR extern const unsigned int xmp_vercode; +LIBXMP_EXPORT int xmp_syserrno (void); + LIBXMP_EXPORT xmp_context xmp_create_context (void); LIBXMP_EXPORT void xmp_free_context (xmp_context); -LIBXMP_EXPORT int xmp_test_module (const char *, struct xmp_test_info *); + LIBXMP_EXPORT int xmp_load_module (xmp_context, const char *); +LIBXMP_EXPORT int xmp_load_module_from_memory (xmp_context, const void *, long); +LIBXMP_EXPORT int xmp_load_module_from_file (xmp_context, void *, long); +LIBXMP_EXPORT int xmp_load_module_from_callbacks (xmp_context, void *, struct xmp_callbacks); + +LIBXMP_EXPORT int xmp_test_module (const char *, struct xmp_test_info *); +LIBXMP_EXPORT int xmp_test_module_from_memory (const void *, long, struct xmp_test_info *); +LIBXMP_EXPORT int xmp_test_module_from_file (void *, struct xmp_test_info *); +LIBXMP_EXPORT int xmp_test_module_from_callbacks (void *, struct xmp_callbacks, struct xmp_test_info *); + LIBXMP_EXPORT void xmp_scan_module (xmp_context); LIBXMP_EXPORT void xmp_release_module (xmp_context); + LIBXMP_EXPORT int xmp_start_player (xmp_context, int, int); LIBXMP_EXPORT int xmp_play_frame (xmp_context); LIBXMP_EXPORT int xmp_play_buffer (xmp_context, void *, int, int); @@ -353,10 +372,6 @@ LIBXMP_EXPORT int xmp_channel_vol (xmp_context, int, int); LIBXMP_EXPORT int xmp_set_player (xmp_context, int, int); LIBXMP_EXPORT int xmp_get_player (xmp_context, int); LIBXMP_EXPORT int xmp_set_instrument_path (xmp_context, const char *); -LIBXMP_EXPORT int xmp_load_module_from_memory (xmp_context, void *, long); -LIBXMP_EXPORT int xmp_load_module_from_file (xmp_context, void *, long); -LIBXMP_EXPORT int xmp_test_module_from_memory (void *, long, struct xmp_test_info *); -LIBXMP_EXPORT int xmp_test_module_from_file (void *, struct xmp_test_info *); /* External sample mixer API */ LIBXMP_EXPORT int xmp_start_smix (xmp_context, int, int); diff --git a/MacOSX/codecs/lib/libopusfile.dylib b/MacOSX/codecs/lib/libopusfile.dylib index c3abf290..49d4c9d4 100755 Binary files a/MacOSX/codecs/lib/libopusfile.dylib and b/MacOSX/codecs/lib/libopusfile.dylib differ diff --git a/MacOSX/codecs/lib/libvorbis.dylib b/MacOSX/codecs/lib/libvorbis.dylib index 06575941..0aad3213 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 a355dc51..fa789bb7 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 df77e605..db4fa361 100755 Binary files a/MacOSX/codecs/lib/libxmp.dylib and b/MacOSX/codecs/lib/libxmp.dylib differ diff --git a/Windows/codecs/include/opus/opusfile.h b/Windows/codecs/include/opus/opusfile.h index 220ac7f7..296d8d9a 100644 --- a/Windows/codecs/include/opus/opusfile.h +++ b/Windows/codecs/include/opus/opusfile.h @@ -6,7 +6,7 @@ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * * THE libopusfile SOURCE CODE IS (C) COPYRIGHT 1994-2012 * - * by the Xiph.Org Foundation and contributors http://www.xiph.org/ * + * by the Xiph.Org Foundation and contributors https://xiph.org/ * * * ******************************************************************** @@ -28,7 +28,7 @@ reference libogg and - libopus + libopus libraries. libopusfile provides several sets of built-in routines for @@ -58,7 +58,7 @@ it is stored in the header to allow you to resample to it after decoding (the libopusfile API does not currently provide a resampler, but the - the + the Speex resampler is a good choice if you need one). In general, if you are playing back the audio, you should leave it at 48 kHz, provided your audio hardware supports it. @@ -68,7 +68,7 @@ Opus files can contain anywhere from 1 to 255 channels of audio. The channel mappings for up to 8 channels are the same as the - Vorbis + Vorbis mappings. A special stereo API can convert everything to 2 channels, making it simple to support multichannel files in an application which only has stereo @@ -284,7 +284,7 @@ struct OpusHead{ A particular tag may occur more than once, and order is significant. The character set encoding for the strings is always UTF-8, but the tag names are limited to ASCII, and treated as case-insensitive. - See the Vorbis + See the Vorbis comment header specification for details. In filling in this structure, libopusfile will null-terminate the @@ -698,7 +698,7 @@ void opus_picture_tag_clear(OpusPictureTag *_pic) OP_ARG_NONNULL(1); #define OP_HTTP_PROXY_PASS_REQUEST (6720) #define OP_GET_SERVER_INFO_REQUEST (6784) -#define OP_URL_OPT(_request) ((_request)+(char *)0) +#define OP_URL_OPT(_request) ((char *)(_request)) /*These macros trigger compilation errors or warnings if the wrong types are provided to one of the URL options.*/ @@ -1890,7 +1890,7 @@ void op_set_dither_enabled(OggOpusFile *_of,int _enabled) OP_ARG_NONNULL(1); signed native-endian 16-bit values at 48 kHz with a nominal range of [-32768,32767). Multiple channels are interleaved using the - Vorbis + Vorbis channel ordering. This must have room for at least \a _buf_size values. \param _buf_size The number of values that can be stored in \a _pcm. @@ -1972,7 +1972,7 @@ OP_WARN_UNUSED_RESULT int op_read(OggOpusFile *_of, signed floats at 48 kHz with a nominal range of [-1.0,1.0]. Multiple channels are interleaved using the - Vorbis + Vorbis channel ordering. This must have room for at least \a _buf_size floats. \param _buf_size The number of floats that can be stored in \a _pcm. diff --git a/Windows/codecs/include/xmp.h b/Windows/codecs/include/xmp.h index 9c8aebcf..2d725411 100644 --- a/Windows/codecs/include/xmp.h +++ b/Windows/codecs/include/xmp.h @@ -320,18 +320,37 @@ struct xmp_frame_info { /* Current frame information */ struct xmp_channel_info channel_info[XMP_MAX_CHANNELS]; /* Current channel information */ }; +struct xmp_callbacks { + unsigned long (*read_func)(void *dest, unsigned long len, + unsigned long nmemb, void *priv); + int (*seek_func)(void *priv, long offset, int whence); + long (*tell_func)(void *priv); + int (*close_func)(void *priv); +}; typedef char *xmp_context; LIBXMP_EXPORT_VAR extern const char *xmp_version; LIBXMP_EXPORT_VAR extern const unsigned int xmp_vercode; +LIBXMP_EXPORT int xmp_syserrno (void); + LIBXMP_EXPORT xmp_context xmp_create_context (void); LIBXMP_EXPORT void xmp_free_context (xmp_context); -LIBXMP_EXPORT int xmp_test_module (const char *, struct xmp_test_info *); + LIBXMP_EXPORT int xmp_load_module (xmp_context, const char *); +LIBXMP_EXPORT int xmp_load_module_from_memory (xmp_context, const void *, long); +LIBXMP_EXPORT int xmp_load_module_from_file (xmp_context, void *, long); +LIBXMP_EXPORT int xmp_load_module_from_callbacks (xmp_context, void *, struct xmp_callbacks); + +LIBXMP_EXPORT int xmp_test_module (const char *, struct xmp_test_info *); +LIBXMP_EXPORT int xmp_test_module_from_memory (const void *, long, struct xmp_test_info *); +LIBXMP_EXPORT int xmp_test_module_from_file (void *, struct xmp_test_info *); +LIBXMP_EXPORT int xmp_test_module_from_callbacks (void *, struct xmp_callbacks, struct xmp_test_info *); + LIBXMP_EXPORT void xmp_scan_module (xmp_context); LIBXMP_EXPORT void xmp_release_module (xmp_context); + LIBXMP_EXPORT int xmp_start_player (xmp_context, int, int); LIBXMP_EXPORT int xmp_play_frame (xmp_context); LIBXMP_EXPORT int xmp_play_buffer (xmp_context, void *, int, int); @@ -353,10 +372,6 @@ LIBXMP_EXPORT int xmp_channel_vol (xmp_context, int, int); LIBXMP_EXPORT int xmp_set_player (xmp_context, int, int); LIBXMP_EXPORT int xmp_get_player (xmp_context, int); LIBXMP_EXPORT int xmp_set_instrument_path (xmp_context, const char *); -LIBXMP_EXPORT int xmp_load_module_from_memory (xmp_context, void *, long); -LIBXMP_EXPORT int xmp_load_module_from_file (xmp_context, void *, long); -LIBXMP_EXPORT int xmp_test_module_from_memory (void *, long, struct xmp_test_info *); -LIBXMP_EXPORT int xmp_test_module_from_file (void *, struct xmp_test_info *); /* External sample mixer API */ LIBXMP_EXPORT int xmp_start_smix (xmp_context, int, int); diff --git a/Windows/codecs/x64/libopusfile-0.dll b/Windows/codecs/x64/libopusfile-0.dll index 4d86316a..92b3cdb5 100644 Binary files a/Windows/codecs/x64/libopusfile-0.dll and b/Windows/codecs/x64/libopusfile-0.dll differ diff --git a/Windows/codecs/x64/libvorbis-0.dll b/Windows/codecs/x64/libvorbis-0.dll index 302a5cb9..f57124be 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 1f76ad41..e8f1d7e6 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 1b194afe..2cc0ea09 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 37c2ca29..09d6e519 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 1dbfed33..6f8522f1 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 92598e3e..fe9ece81 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/opusfile.lib b/Windows/codecs/x86-watcom/opusfile.lib index 9ac986ab..c0c47755 100644 Binary files a/Windows/codecs/x86-watcom/opusfile.lib and b/Windows/codecs/x86-watcom/opusfile.lib differ diff --git a/Windows/codecs/x86-watcom/vorbis.lib b/Windows/codecs/x86-watcom/vorbis.lib index b1acb832..03c1cf7f 100644 Binary files a/Windows/codecs/x86-watcom/vorbis.lib and b/Windows/codecs/x86-watcom/vorbis.lib differ diff --git a/Windows/codecs/x86-watcom/vorbisfile.lib b/Windows/codecs/x86-watcom/vorbisfile.lib index c6a0a484..a292d96a 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/libopusfile-0.dll b/Windows/codecs/x86/libopusfile-0.dll index 8d35ab66..3cb063e0 100644 Binary files a/Windows/codecs/x86/libopusfile-0.dll and b/Windows/codecs/x86/libopusfile-0.dll differ diff --git a/Windows/codecs/x86/libvorbis-0.dll b/Windows/codecs/x86/libvorbis-0.dll index 86451f36..6c116142 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 72968857..7eb9b353 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 8eb47dc6..2de2711f 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 e9919783..18b38695 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 0b809066..70a2fb6f 100644 Binary files a/Windows/codecs/x86/libxmp.lib and b/Windows/codecs/x86/libxmp.lib differ