diff --git a/polymer/eduke32/source/jaudiolib/third-party/README.txt b/polymer/eduke32/source/jaudiolib/third-party/README.txt index 3dbfa6736..44d20cfed 100644 --- a/polymer/eduke32/source/jaudiolib/third-party/README.txt +++ b/polymer/eduke32/source/jaudiolib/third-party/README.txt @@ -6,8 +6,8 @@ application by Stephen Booth. http://sbooth.org/Max/ -MinGW binaries compiled from vanilla Xiph.org libogg-1.1.4 and libvorbis-1.2.3 -on MinGW GCC 3.4.5. +MinGW binaries compiled from vanilla Xiph.org libogg-1.3.0 and libvorbis-1.3.3 +on MinGW GCC 4.7 http://xiph.org/downloads/ diff --git a/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/ogg/config_types.h b/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/ogg/config_types.h index 327ef0b33..1e7d49098 100644 --- a/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/ogg/config_types.h +++ b/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/ogg/config_types.h @@ -1,11 +1,25 @@ -#ifndef __CONFIG_TYPES_H__ -#define __CONFIG_TYPES_H__ - -/* these are filled in by configure */ -typedef short ogg_int16_t; -typedef unsigned short ogg_uint16_t; -typedef int ogg_int32_t; -typedef unsigned int ogg_uint32_t; -typedef long long ogg_int64_t; - -#endif +#ifndef __CONFIG_TYPES_H__ +#define __CONFIG_TYPES_H__ + +/* these are filled in by configure */ +#define INCLUDE_INTTYPES_H 1 +#define INCLUDE_STDINT_H 1 +#define INCLUDE_SYS_TYPES_H 1 + +#if INCLUDE_INTTYPES_H +# include +#endif +#if INCLUDE_STDINT_H +# include +#endif +#if INCLUDE_SYS_TYPES_H +# include +#endif + +typedef short ogg_int16_t; +typedef unsigned short ogg_uint16_t; +typedef int ogg_int32_t; +typedef unsigned int ogg_uint32_t; +typedef long long ogg_int64_t; + +#endif diff --git a/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/ogg/ogg.h b/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/ogg/ogg.h index ae0cfd534..cea4ebed7 100644 --- a/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/ogg/ogg.h +++ b/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/ogg/ogg.h @@ -11,7 +11,7 @@ ******************************************************************** function: toplevel libogg include - last mod: $Id: ogg.h 16051 2009-05-27 05:00:06Z xiphmont $ + last mod: $Id: ogg.h 18044 2011-08-01 17:55:20Z gmaxwell $ ********************************************************************/ #ifndef _OGG_H @@ -78,7 +78,7 @@ typedef struct { ogg_int64_t packetno; /* sequence number for decode; the framing knows where there's a hole in the data, but we need coupling so that the codec - (which is in a seperate abstraction + (which is in a separate abstraction layer) also knows about the gap */ ogg_int64_t granulepos; @@ -98,7 +98,7 @@ typedef struct { ogg_int64_t packetno; /* sequence number for decode; the framing knows where there's a hole in the data, but we need coupling so that the codec - (which is in a seperate abstraction + (which is in a separate abstraction layer) also knows about the gap */ } ogg_packet; @@ -159,7 +159,9 @@ extern int ogg_stream_packetin(ogg_stream_state *os, ogg_packet *op); extern int ogg_stream_iovecin(ogg_stream_state *os, ogg_iovec_t *iov, int count, long e_o_s, ogg_int64_t granulepos); extern int ogg_stream_pageout(ogg_stream_state *os, ogg_page *og); +extern int ogg_stream_pageout_fill(ogg_stream_state *os, ogg_page *og, int nfill); extern int ogg_stream_flush(ogg_stream_state *os, ogg_page *og); +extern int ogg_stream_flush_fill(ogg_stream_state *os, ogg_page *og, int nfill); /* Ogg BITSTREAM PRIMITIVES: decoding **************************/ diff --git a/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/ogg/os_types.h b/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/ogg/os_types.h index f6f8b3818..d6691b703 100644 --- a/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/ogg/os_types.h +++ b/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/ogg/os_types.h @@ -11,7 +11,7 @@ ******************************************************************** function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id: os_types.h 16649 2009-10-25 00:49:58Z ds $ + last mod: $Id: os_types.h 17712 2010-12-03 17:10:02Z xiphmont $ ********************************************************************/ #ifndef _OS_TYPES_H @@ -68,11 +68,11 @@ #elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */ -# include +# include typedef int16_t ogg_int16_t; - typedef u_int16_t ogg_uint16_t; + typedef uint16_t ogg_uint16_t; typedef int32_t ogg_int32_t; - typedef u_int32_t ogg_uint32_t; + typedef uint32_t ogg_uint32_t; typedef int64_t ogg_int64_t; #elif defined(__HAIKU__) @@ -90,9 +90,9 @@ /* Be */ # include typedef int16_t ogg_int16_t; - typedef u_int16_t ogg_uint16_t; + typedef uint16_t ogg_uint16_t; typedef int32_t ogg_int32_t; - typedef u_int32_t ogg_uint32_t; + typedef uint32_t ogg_uint32_t; typedef int64_t ogg_int64_t; #elif defined (__EMX__) @@ -140,7 +140,6 @@ #else -# include # include #endif diff --git a/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/vorbis/vorbisfile.h b/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/vorbis/vorbisfile.h index a865cd097..9271331e7 100644 --- a/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/vorbis/vorbisfile.h +++ b/polymer/eduke32/source/jaudiolib/third-party/mingw32/include/vorbis/vorbisfile.h @@ -11,7 +11,7 @@ ******************************************************************** function: stdio-based convenience library for opening/seeking/decoding - last mod: $Id: vorbisfile.h 17021 2010-03-24 09:29:41Z xiphmont $ + last mod: $Id: vorbisfile.h 17182 2010-04-29 03:48:32Z xiphmont $ ********************************************************************/ @@ -147,14 +147,14 @@ typedef struct OggVorbis_File { extern int ov_clear(OggVorbis_File *vf); -extern int ov_fopen(char *path,OggVorbis_File *vf); -extern int ov_open(FILE *f,OggVorbis_File *vf,char *initial,long ibytes); +extern int ov_fopen(const char *path,OggVorbis_File *vf); +extern int ov_open(FILE *f,OggVorbis_File *vf,const char *initial,long ibytes); extern int ov_open_callbacks(void *datasource, OggVorbis_File *vf, - char *initial, long ibytes, ov_callbacks callbacks); + const char *initial, long ibytes, ov_callbacks callbacks); -extern int ov_test(FILE *f,OggVorbis_File *vf,char *initial,long ibytes); +extern int ov_test(FILE *f,OggVorbis_File *vf,const char *initial,long ibytes); extern int ov_test_callbacks(void *datasource, OggVorbis_File *vf, - char *initial, long ibytes, ov_callbacks callbacks); + const char *initial, long ibytes, ov_callbacks callbacks); extern int ov_test_open(OggVorbis_File *vf); extern long ov_bitrate(OggVorbis_File *vf,int i); diff --git a/polymer/eduke32/source/jaudiolib/third-party/mingw32/lib/libogg.a b/polymer/eduke32/source/jaudiolib/third-party/mingw32/lib/libogg.a index b994dd5ed..6e624f068 100644 Binary files a/polymer/eduke32/source/jaudiolib/third-party/mingw32/lib/libogg.a and b/polymer/eduke32/source/jaudiolib/third-party/mingw32/lib/libogg.a differ diff --git a/polymer/eduke32/source/jaudiolib/third-party/mingw32/lib/libvorbis.a b/polymer/eduke32/source/jaudiolib/third-party/mingw32/lib/libvorbis.a index 4c61eaba8..0ca4b034a 100644 Binary files a/polymer/eduke32/source/jaudiolib/third-party/mingw32/lib/libvorbis.a and b/polymer/eduke32/source/jaudiolib/third-party/mingw32/lib/libvorbis.a differ diff --git a/polymer/eduke32/source/jaudiolib/third-party/mingw32/lib/libvorbisfile.a b/polymer/eduke32/source/jaudiolib/third-party/mingw32/lib/libvorbisfile.a index d56934509..359b22be3 100644 Binary files a/polymer/eduke32/source/jaudiolib/third-party/mingw32/lib/libvorbisfile.a and b/polymer/eduke32/source/jaudiolib/third-party/mingw32/lib/libvorbisfile.a differ