gosu 1.3.0 → 1.4.0

data/dependencies/SDL_sound/SDL_sound_coreaudio.c

@@ -194,8 +194,8 @@ SInt64 CoreAudio_SizeCallback(void* inClientData)
 {
 	SDL_RWops* rw_ops = (SDL_RWops*)inClientData;
 	SInt64 current_position = SDL_RWtell(rw_ops);
-	SInt64 end_position = SDL_RWseek(rw_ops, 0, SEEK_END);
-	SDL_RWseek(rw_ops, current_position, SEEK_SET);
+	SInt64 end_position = SDL_RWseek(rw_ops, 0, RW_SEEK_END);
+	SDL_RWseek(rw_ops, current_position, RW_SEEK_SET);
 //	fprintf(stderr, "CoreAudio_SizeCallback:%d\n", end_position);
 
 	return end_position;
@@ -210,7 +210,7 @@ OSStatus CoreAudio_ReadCallback(
 )
 {
 	SDL_RWops* rw_ops = (SDL_RWops*)inClientData;
-	SDL_RWseek(rw_ops, inPosition, SEEK_SET);
+	SDL_RWseek(rw_ops, inPosition, RW_SEEK_SET);
 	size_t bytes_actually_read = SDL_RWread(rw_ops, data_buffer, 1, requestCount);
 	// Not sure how to test for a read error with SDL_RWops
 //	fprintf(stderr, "CoreAudio_ReadCallback:%d, %d\n", requestCount, bytes_actually_read);

data/dependencies/SDL_sound/SDL_sound_flac.c

@@ -55,7 +55,7 @@ static size_t flac_read(void* pUserData, void* pBufferOut, size_t bytesToRead)
             sample->flags |= SOUND_SAMPLEFLAG_EOF;
             break;
         } /* if */
-        else if (retval == -1)
+        else if (rc == -1) /** FIXME: this error check is broken **/
         {
             sample->flags |= SOUND_SAMPLEFLAG_ERROR;
             break;

data/dependencies/SDL_sound/SDL_sound_internal.h

@@ -18,14 +18,9 @@
 #error Do not include this header from your applications.
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
 #include "SDL_sound.h"
 
-#if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)
+#if ((defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)) && !(defined(_WIN32) || defined(__OS2__))
 #define SOUND_HAVE_PRAGMA_VISIBILITY 1
 #endif
 
@@ -34,11 +29,14 @@
 #endif
 
 #if (defined DEBUG_CHATTER)
-#define SNDDBG(x) SDL_LogDebug x
+#define SNDDBG(x) SDL_Log x
 #else
 #define SNDDBG(x)
 #endif
 
+#ifndef SOUND_SUPPORTS_MIDI
+#define SOUND_SUPPORTS_MIDI  0
+#endif
 #ifndef SOUND_SUPPORTS_MP3
 #define SOUND_SUPPORTS_MP3 1
 #endif
@@ -86,7 +84,7 @@
  *  SDL_sound that rely on it, though.
  * !!! FIXME: SDL2 supports more channels.
  */
-#define MAX_CHANNELS 2
+#define SOUND_MAX_CHANNELS  2
 
 
 typedef struct __SOUND_DECODERFUNCTIONS__
@@ -294,10 +292,19 @@ Uint32 __Sound_convertMsToBytePos(Sound_AudioInfo *info, Uint32 ms);
 #define BAIL_MACRO(e, r) { __Sound_SetError(e); return r; }
 #define BAIL_IF_MACRO(c, e, r) if (c) { __Sound_SetError(e); return r; }
 
-#ifdef __cplusplus
-extern "C" {
+#if SDL_VERSION_ATLEAST(2,0,12)
+#define HAVE_SDL_STRTOKR
+#else
+#define SDL_strtokr __Sound_strtokr
+extern char *SDL_strtokr(char *s1, const char *s2, char **saveptr);
 #endif
 
+/* SDL doesn't provide a rand() replacement */
+#define SDL_rand __Sound_rand
+#define SDL_srand __Sound_srand
+extern int SDL_rand(void);
+extern void SDL_srand(unsigned int seed);
+
 #endif /* defined _INCLUDE_SDL_SOUND_INTERNAL_H_ */
 
 /* end of SDL_sound_internal.h ... */

data/dependencies/SDL_sound/SDL_sound_modplug.c

@@ -36,6 +36,7 @@ static const char *extensions_modplug[] =
     "DMF",   /* DMF DELUSION DIGITAL MUSIC FILEFORMAT (X-Tracker)           */
     "DSM",   /* DSIK Internal Format module                                 */
     "FAR",   /* Farandole module                                            */
+    "GDM",   /* General Digital Music                                       */
     "IT",    /* Impulse Tracker IT file                                     */
     "MDL",   /* DigiTracker module                                          */
     "MED",   /* OctaMed MED file                                            */
@@ -50,9 +51,6 @@ static const char *extensions_modplug[] =
     "ULT",   
     "UMX",
     "XM",    /* FastTracker II                                              */
-    "ABC",
-    "MID",
-    "MIDI",
     NULL
 };
 
@@ -81,53 +79,53 @@ static int MODPLUG_open(Sound_Sample *sample, const char *ext)
     ModPlug_Settings settings;
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     ModPlugFile *module;
-    Uint8 *data;
-    size_t size;
-    Uint32 retval;
-    int has_extension = 0;
+    void *data;
+    Sint64 size;
+    size_t retval;
     int i;
 
     /*
      * Apparently ModPlug's loaders are too forgiving. They gladly accept
      *  streams that they shouldn't. For now, rely on file extension instead.
      */
-    for (i = 0; extensions_modplug[i] != NULL; i++)
+    for (i = 0; ext != NULL && extensions_modplug[i] != NULL; i++)
     {
         if (SDL_strcasecmp(ext, extensions_modplug[i]) == 0)
-        {
-            has_extension = 1;
             break;
-        } /* if */
     } /* for */
 
-    if (!has_extension)
+    if (ext == NULL || extensions_modplug[i] == NULL)
     {
         SNDDBG(("MODPLUG: Unrecognized file type: %s\n", ext));
         BAIL_MACRO("MODPLUG: Not a module file.", 0);
     } /* if */
-    
+
     /* ModPlug needs the entire stream in one big chunk. I don't like it,
        but I don't think there's any way around it.  !!! FIXME: rework modplug? */
-    data = (Uint8 *) SDL_malloc(CHUNK_SIZE);
-    BAIL_IF_MACRO(data == NULL, ERR_OUT_OF_MEMORY, 0);
-    size = 0;
+    size = SDL_RWsize(internal->rw);
+    BAIL_IF_MACRO(size <= 0 || size > (Sint64)0x7fffffff, "MODPLUG: Not a module file.", 0);
 
-    do
+    if (internal->rw->type == SDL_RWOPS_MEMORY || internal->rw->type == SDL_RWOPS_MEMORY_RO)
+    {
+        data = internal->rw->hidden.mem.base;
+        retval = 0;
+    }
+    else
     {
-        retval = SDL_RWread(internal->rw, &data[size], 1, CHUNK_SIZE);
-        size += retval;
-        if (retval == CHUNK_SIZE)
-        {
-            data = (Uint8 *) SDL_realloc(data, size + CHUNK_SIZE);
-            BAIL_IF_MACRO(data == NULL, ERR_OUT_OF_MEMORY, 0);
-        } /* if */
-    } while (retval > 0);
+        data = SDL_malloc((size_t) size);
+        BAIL_IF_MACRO(data == NULL, ERR_OUT_OF_MEMORY, 0);
+        retval = SDL_RWread(internal->rw, data, 1, size);
+        if (retval != (size_t)size) SDL_free(data);
+        BAIL_IF_MACRO(retval != (size_t)size, ERR_IO_ERROR, 0);
+    }
 
     SDL_memcpy(&sample->actual, &sample->desired, sizeof (Sound_AudioInfo));
     if (sample->actual.rate == 0) sample->actual.rate = 44100;
     if (sample->actual.channels == 0) sample->actual.channels = 2;
     if (sample->actual.format == 0) sample->actual.format = AUDIO_S16SYS;
 
+    SDL_zero(settings);
+
     settings.mChannels=sample->actual.channels;
     settings.mFrequency=sample->actual.rate;
     settings.mBits = sample->actual.format & 0xFF;
@@ -153,8 +151,8 @@ static int MODPLUG_open(Sound_Sample *sample, const char *ext)
 
     /* The buffer may be a bit too large, but that doesn't matter. I think
        it's safe to free it as soon as ModPlug_Load() is finished anyway. */
-    module = ModPlug_Load((void *) data, size, &settings);
-    SDL_free(data);
+    module = ModPlug_Load(data, (int) size, &settings);
+    if (retval) SDL_free(data);
     BAIL_IF_MACRO(module == NULL, "MODPLUG: Not a module file.", 0);
 
     internal->total_time = ModPlug_GetLength(module);

data/dependencies/SDL_sound/SDL_sound_mp3.c

@@ -9,7 +9,7 @@
 /*
  * MP3 decoder for SDL_sound.
  *
- * !!! FIXME: write something here.
+ * Uses dr_mp3, a public domain, single-header library.
  *
  * dr_mp3 is here: https://github.com/mackron/dr_libs/
  */
@@ -20,29 +20,17 @@
 #if SOUND_SUPPORTS_MP3
 
 #define DR_MP3_IMPLEMENTATION
+
 #define DR_MP3_NO_STDIO 1
+#define DR_MP3_FLOAT_OUTPUT 1
 #define DRMP3_ASSERT(x) SDL_assert((x))
 #define DRMP3_MALLOC(sz) SDL_malloc((sz))
 #define DRMP3_REALLOC(p, sz) SDL_realloc((p), (sz))
 #define DRMP3_FREE(p) SDL_free((p))
 #define DRMP3_COPY_MEMORY(dst, src, sz) SDL_memcpy((dst), (src), (sz))
+#define DRMP3_MOVE_MEMORY(dst, src, sz) SDL_memmove((dst), (src), (sz))
 #define DRMP3_ZERO_MEMORY(p, sz) SDL_memset((p), 0, (sz))
 
-#if !defined(__clang_analyzer__)
-#ifdef memset
-#undef memset
-#endif
-#ifdef memcpy
-#undef memcpy
-#endif
-#ifdef memmove
-#undef memmove
-#endif
-#define memset SDL_memset
-#define memcpy SDL_memcpy
-#define memmove SDL_memmove
-#endif
-
 #include "dr_mp3.h"
 
 static size_t mp3_read(void* pUserData, void* pBufferOut, size_t bytesToRead)
@@ -62,7 +50,7 @@ static size_t mp3_read(void* pUserData, void* pBufferOut, size_t bytesToRead)
             sample->flags |= SOUND_SAMPLEFLAG_EOF;
             break;
         } /* if */
-        else if (retval == -1)
+        else if (rc == -1) /** FIXME: this error check is broken **/
         {
             sample->flags |= SOUND_SAMPLEFLAG_ERROR;
             break;

data/dependencies/SDL_sound/SDL_sound_raw.c

@@ -43,14 +43,14 @@ static void RAW_quit(void)
 static int RAW_open(Sound_Sample *sample, const char *ext)
 {
     Sound_SampleInternal *internal = sample->opaque;
-    SDL_RWops *rw = internal->rw;
-    Uint32 pos, sample_rate;
-  
+    Sint64 pos;
+    Uint32 sample_rate;
+
         /*
          * We check this explicitly, since we have no other way to
          *  determine whether we should handle this data or not.
          */
-    if (SDL_strcasecmp(ext, "RAW") != 0)
+    if (!ext || SDL_strcasecmp(ext, "RAW") != 0)
         BAIL_MACRO("RAW: extension isn't explicitly \"RAW\".", 0);
 
         /*
@@ -73,11 +73,11 @@ static int RAW_open(Sound_Sample *sample, const char *ext)
     SDL_memcpy(&sample->actual, &sample->desired, sizeof (Sound_AudioInfo));
     sample->flags = SOUND_SAMPLEFLAG_CANSEEK;
 
-    if ( (pos = SDL_RWseek(internal->rw, 0, SEEK_END) ) <= 0) {
-        BAIL_MACRO("RAW: cannot seek the end of the file \"RAW\".", 0);
+    if ((pos = SDL_RWseek(internal->rw, 0, RW_SEEK_END)) <= 0) {
+        BAIL_MACRO("RAW: can't seek to the end of the file.", 0);
     }
-    if ( SDL_RWseek(internal->rw, 0, SEEK_SET) ) {
-        BAIL_MACRO("RAW: cannot reset file \"RAW\".", 0);
+    if ( SDL_RWseek(internal->rw, 0, RW_SEEK_SET) != 0) {
+        BAIL_MACRO("RAW: can't reset file.", 0);
     }
 
     sample_rate =  (sample->actual.rate * sample->actual.channels
@@ -111,7 +111,7 @@ static Uint32 RAW_read(Sound_Sample *sample)
     if (retval == 0)
         sample->flags |= SOUND_SAMPLEFLAG_EOF;
 
-    else if (retval == -1)
+    else if (retval == -1) /** FIXME: this error check is broken **/
         sample->flags |= SOUND_SAMPLEFLAG_ERROR;
 
         /* (next call this EAGAIN may turn into an EOF or error.) */
@@ -125,7 +125,7 @@ static Uint32 RAW_read(Sound_Sample *sample)
 static int RAW_rewind(Sound_Sample *sample)
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
-    BAIL_IF_MACRO(SDL_RWseek(internal->rw, 0, SEEK_SET) != 0, ERR_IO_ERROR, 0);
+    BAIL_IF_MACRO(SDL_RWseek(internal->rw, 0, RW_SEEK_SET) != 0, ERR_IO_ERROR, 0);
     return 1;
 } /* RAW_rewind */
 
@@ -134,7 +134,7 @@ static int RAW_seek(Sound_Sample *sample, Uint32 ms)
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     int pos = (int) __Sound_convertMsToBytePos(&sample->actual, ms);
-    int err = (SDL_RWseek(internal->rw, pos, SEEK_SET) != pos);
+    int err = (SDL_RWseek(internal->rw, pos, RW_SEEK_SET) != pos);
     BAIL_IF_MACRO(err, ERR_IO_ERROR, 0);
     return 1;
 } /* RAW_seek */

data/dependencies/SDL_sound/SDL_sound_shn.c

@@ -174,6 +174,10 @@ static const Uint8 ulaw_outward[13][256] = {
 #define M_PI    3.14159265358979323846
 #endif
 
+#if defined(HAVE_LIBC) && defined(__WATCOMC__) /* Watcom has issues... */
+#define SDL_log log
+#endif
+
 
 static int word_get(shn_t *shn, SDL_RWops *rw, Uint32 *word)
 {
@@ -331,7 +335,7 @@ static SDL_INLINE int determine_shn_version(Sound_Sample *sample,
      *  check the whole stream, though.
      */
 
-    if (SDL_strcasecmp(ext, "shn") == 0)
+    if (ext != NULL && SDL_strcasecmp(ext, "shn") == 0)
         return extended_shn_magic_search(sample);
 
     BAIL_IF_MACRO(SDL_RWread(rw, &magic, sizeof (magic), 1) != 1, NULL, -1);
@@ -1016,14 +1020,11 @@ static Uint32 SHN_read(Sound_Sample *sample)
 {
     Uint32 retval = 0;
     Sint32 chan = 0;
-    Uint32 cpyBytes = 0;
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     SDL_RWops *rw = internal->rw;
     shn_t *shn = (shn_t *) internal->decoder_private;
     Sint32 cmd;
 
-    SDL_assert(shn->backBufLeft >= 0);
-
         /* see if there are leftovers to copy... */
     if (shn->backBufLeft > 0)
     {
@@ -1253,10 +1254,10 @@ static Uint32 SHN_read(Sound_Sample *sample)
 static int SHN_rewind(Sound_Sample *sample)
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
-    shn_t *shn = (shn_t *) internal->decoder_private;
 
 #if 0
-    int rc = SDL_RWseek(internal->rw, shn->start_pos, SEEK_SET);
+    shn_t *shn = (shn_t *) internal->decoder_private;
+    int rc = SDL_RWseek(internal->rw, shn->start_pos, RW_SEEK_SET);
     BAIL_IF_MACRO(rc != shn->start_pos, ERR_IO_ERROR, 0);
     /* !!! FIXME: set state. */
     return 1;
@@ -1267,7 +1268,7 @@ static int SHN_rewind(Sound_Sample *sample)
      * !!! FIXME:  to decode. The below kludge adds unneeded overhead and
      * !!! FIXME:  risk of failure.
      */
-    BAIL_IF_MACRO(SDL_RWseek(internal->rw, 0, SEEK_SET) != 0, ERR_IO_ERROR, 0);
+    BAIL_IF_MACRO(SDL_RWseek(internal->rw, 0, RW_SEEK_SET) != 0, ERR_IO_ERROR, 0);
     SHN_close(sample);
     return SHN_open(sample, "SHN");
 #endif

data/dependencies/SDL_sound/SDL_sound_voc.c

@@ -122,7 +122,7 @@ static SDL_INLINE int voc_check_header(SDL_RWops *src)
 
     datablockofs = SDL_SwapLE16(datablockofs);
 
-    if (SDL_RWseek(src, datablockofs, SEEK_SET) != datablockofs)
+    if (SDL_RWseek(src, datablockofs, RW_SEEK_SET) != datablockofs)
     {
         BAIL_MACRO("VOC: Failed to seek to data block.", 0);
     } /* if */
@@ -303,6 +303,8 @@ static int voc_get_block(Sound_Sample *sample, vs_t *v)
 
                 if (uc)
                     sample->actual.channels = 2;  /* Stereo */
+                /* VOC_EXTENDED may be read before spec->channels inited: */
+                else sample->actual.channels = 1;
 
                 /* Needed number of channels before finishing
                    compute for rate */
@@ -386,7 +388,7 @@ static int voc_read_waveform(Sound_Sample *sample, int fill_buf, Uint32 max)
             cur = SDL_RWtell(src);
             if (cur >= 0)
             {
-                rc = SDL_RWseek(src, max, SEEK_CUR);
+                rc = SDL_RWseek(src, max, RW_SEEK_CUR);
                 if (rc >= 0)
                     done = rc - cur;
                 else
@@ -480,7 +482,7 @@ static int VOC_rewind(Sound_Sample *sample)
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     vs_t *v = (vs_t *) internal->decoder_private;
-    int rc = SDL_RWseek(internal->rw, v->start_pos, SEEK_SET);
+    int rc = SDL_RWseek(internal->rw, v->start_pos, RW_SEEK_SET);
     BAIL_IF_MACRO(rc != v->start_pos, ERR_IO_ERROR, 0);
     v->rest = 0;
     return 1;
@@ -514,7 +516,7 @@ static int VOC_seek(Sound_Sample *sample, Uint32 ms)
         Uint32 rc = voc_read_waveform(sample, 0, offset);
         if ( (rc == 0) || (!voc_get_block(sample, v)) )
         {
-            SDL_RWseek(internal->rw, origpos, SEEK_SET);
+            SDL_RWseek(internal->rw, origpos, RW_SEEK_SET);
             v->rest = origrest;
             return 0;
         } /* if */

data/dependencies/SDL_sound/SDL_sound_vorbis.c

@@ -28,6 +28,7 @@
 #define STB_VORBIS_NO_PUSHDATA_API 1
 #define STB_VORBIS_MAX_CHANNELS 6
 #define STBV_CDECL
+#define STB_VORBIS_NO_COMMENTS 1
 #define STB_FORCEINLINE SDL_FORCE_INLINE
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
 #define STB_VORBIS_BIG_ENDIAN 1
@@ -43,26 +44,20 @@
 #ifdef memcpy
 #undef memcpy
 #endif
-#ifdef alloca
-#undef alloca
-#endif
 #define assert SDL_assert
 #define memset SDL_memset
 #define memcmp SDL_memcmp
 #define memcpy SDL_memcpy
 #define qsort SDL_qsort
-#define pow SDL_pow
-#define floor SDL_floor
 #define malloc SDL_malloc
 #define realloc SDL_realloc
 #define free SDL_free
+/* there is no 'dealloca' in stb_vorbis: we need alloca()
+#ifdef alloca
+#undef alloca
+#endif
 #define alloca(x) ((void *) SDL_stack_alloc(Uint8, (x)))
-#define dealloca(x) SDL_stack_free((x))
-#define ldexp(v, e) SDL_scalbn((v), (e))
-#define abs(x) SDL_abs(x)
-#define cos(x) SDL_cos(x)
-#define sin(x) SDL_sin(x)
-#define log(x) SDL_log(x)
+*/
 #endif
 #include "stb_vorbis.h"
 

data/dependencies/SDL_sound/SDL_sound_wav.c

@@ -72,6 +72,7 @@ static SDL_INLINE int read_uint8(SDL_RWops *rw, Uint8 *ui8)
 
 #define FMT_NORMAL 0x0001    /* Uncompressed waveform data.     */
 #define FMT_ADPCM  0x0002    /* ADPCM compressed waveform data. */
+#define FMT_IEEE_FLOAT  0x0003    /* Uncompressed IEEE floating point waveform data. */
 
 typedef struct
 {
@@ -226,7 +227,7 @@ static Uint32 read_sample_fmt_normal(Sound_Sample *sample)
     if ((retval == 0) || (w->bytesLeft == 0))
         sample->flags |= SOUND_SAMPLEFLAG_EOF;
 
-    else if (retval == -1)
+    else if (retval == -1) /** FIXME: this error check is broken **/
         sample->flags |= SOUND_SAMPLEFLAG_ERROR;
 
         /* (next call this EAGAIN may turn into an EOF or error.) */
@@ -244,7 +245,7 @@ static int seek_sample_fmt_normal(Sound_Sample *sample, Uint32 ms)
     fmt_t *fmt = w->fmt;
     int offset = __Sound_convertMsToBytePos(&sample->actual, ms);
     int pos = (int) (fmt->data_starting_offset + offset);
-    int rc = SDL_RWseek(internal->rw, pos, SEEK_SET);
+    int rc = SDL_RWseek(internal->rw, pos, RW_SEEK_SET);
     BAIL_IF_MACRO(rc != pos, ERR_IO_ERROR, 0);
     w->bytesLeft = fmt->total_bytes - offset;
     return 1;  /* success. */
@@ -362,12 +363,10 @@ static SDL_INLINE int decode_adpcm_sample_frame(Sound_Sample *sample)
     SDL_RWops *rw = internal->rw;
     int i;
     int max = fmt->wChannels;
-    Sint32 delta;
     Uint8 nib = fmt->fmt.adpcm.nibble;
 
     for (i = 0; i < max; i++)
     {
-        Uint8 byte;
         Sint16 iCoef1 = fmt->fmt.adpcm.aCoef[headers[i].bPredictor].iCoef1;
         Sint16 iCoef2 = fmt->fmt.adpcm.aCoef[headers[i].bPredictor].iCoef2;
         Sint32 lPredSamp = ((headers[i].iSamp1 * iCoef1) +
@@ -497,7 +496,7 @@ static int seek_sample_fmt_adpcm(Sound_Sample *sample, Uint32 ms)
     int bpb = (fmt->fmt.adpcm.wSamplesPerBlock * fmt->sample_frame_size);
     int skipsize = (offset / bpb) * fmt->wBlockAlign;
     int pos = skipsize + fmt->data_starting_offset;
-    int rc = SDL_RWseek(internal->rw, pos, SEEK_SET);
+    int rc = SDL_RWseek(internal->rw, pos, RW_SEEK_SET);
     BAIL_IF_MACRO(rc != pos, ERR_IO_ERROR, 0);
 
     /* The offset we need is in this block, so we need to decode to there. */
@@ -505,7 +504,7 @@ static int seek_sample_fmt_adpcm(Sound_Sample *sample, Uint32 ms)
     rc = (offset % bpb);  /* bytes into this block we need to decode */
     if (!read_adpcm_block_headers(sample))
     {
-        SDL_RWseek(internal->rw, origpos, SEEK_SET);  /* try to make sane. */
+        SDL_RWseek(internal->rw, origpos, RW_SEEK_SET);  /* try to make sane. */
         return 0;
     } /* if */
 
@@ -516,7 +515,7 @@ static int seek_sample_fmt_adpcm(Sound_Sample *sample, Uint32 ms)
     {
         if (!decode_adpcm_sample_frame(sample))
         {
-            SDL_RWseek(internal->rw, origpos, SEEK_SET);
+            SDL_RWseek(internal->rw, origpos, RW_SEEK_SET);
             fmt->fmt.adpcm.samples_left_in_block = origsampsleft;
             return 0;
         } /* if */
@@ -599,16 +598,17 @@ static int read_fmt(SDL_RWops *rw, fmt_t *fmt)
             SNDDBG(("WAV: Appears to be ADPCM compressed audio.\n"));
             return read_fmt_adpcm(rw, fmt);
 
+        case FMT_IEEE_FLOAT:
+            SNDDBG(("WAV: Appears to be IEEE float uncompressed audio.\n"));
+            return read_fmt_normal(rw, fmt);  /* just normal PCM, otherwise. */
+
         /* add other types here. */
 
-        default:
-            SNDDBG(("WAV: Format 0x%X is unknown.\n",
-                    (unsigned int) fmt->wFormatTag));
-            BAIL_MACRO("WAV: Unsupported format", 0);
     } /* switch */
 
-    SDL_assert(0);  /* shouldn't hit this point. */
-    return 0;
+    SNDDBG(("WAV: Format 0x%X is unknown.\n",
+            (unsigned int) fmt->wFormatTag));
+    BAIL_MACRO("WAV: Unsupported format", 0);
 } /* read_fmt */
 
 
@@ -632,7 +632,7 @@ static int find_chunk(SDL_RWops *rw, Uint32 id)
         SDL_assert(siz >= 0);
         pos += (sizeof (Uint32) * 2) + siz;
         if (siz > 0)
-            BAIL_IF_MACRO(SDL_RWseek(rw, pos, SEEK_SET) != pos, NULL, 0);
+            BAIL_IF_MACRO(SDL_RWseek(rw, pos, RW_SEEK_SET) != pos, NULL, 0);
     } /* while */
 
     return 0;  /* shouldn't hit this, but just in case... */
@@ -645,7 +645,6 @@ static int WAV_open_internal(Sound_Sample *sample, const char *ext, fmt_t *fmt)
     SDL_RWops *rw = internal->rw;
     data_t d;
     wav_t *w;
-    Uint32 pos;
 
     BAIL_IF_MACRO(SDL_ReadLE32(rw) != riffID, "WAV: Not a RIFF file.", 0);
     SDL_ReadLE32(rw);  /* throw the length away; we get this info later. */
@@ -653,26 +652,33 @@ static int WAV_open_internal(Sound_Sample *sample, const char *ext, fmt_t *fmt)
     BAIL_IF_MACRO(!find_chunk(rw, fmtID), "WAV: No format chunk.", 0);
     BAIL_IF_MACRO(!read_fmt_chunk(rw, fmt), "WAV: Can't read format chunk.", 0);
 
-    /* !!! FIXME: need float32 format stuff, since it's not just wBitsPerSample. */
-
     sample->actual.channels = (Uint8) fmt->wChannels;
     sample->actual.rate = fmt->dwSamplesPerSec;
-    if (fmt->wBitsPerSample == 4)
-        sample->actual.format = AUDIO_S16SYS;
-    else if (fmt->wBitsPerSample == 8)
-        sample->actual.format = AUDIO_U8;
-    else if (fmt->wBitsPerSample == 16)
-        sample->actual.format = AUDIO_S16LSB;
-    else if (fmt->wBitsPerSample == 32)
-        sample->actual.format = AUDIO_S32LSB;
+
+    if (fmt->wFormatTag == FMT_IEEE_FLOAT)
+    {
+        BAIL_IF_MACRO(fmt->wBitsPerSample != 32, "WAV: Unsupported sample size.", 0);
+        sample->actual.format = AUDIO_F32LSB;
+    } /* if */
     else
     {
-        SNDDBG(("WAV: %d bits per sample!?\n", (int) fmt->wBitsPerSample));
-        BAIL_MACRO("WAV: Unsupported sample size.", 0);
+        if (fmt->wBitsPerSample == 4)
+            sample->actual.format = AUDIO_S16SYS;
+        else if (fmt->wBitsPerSample == 8)
+            sample->actual.format = AUDIO_U8;
+        else if (fmt->wBitsPerSample == 16)
+            sample->actual.format = AUDIO_S16LSB;
+        else if (fmt->wBitsPerSample == 32)
+            sample->actual.format = AUDIO_S32LSB;
+        else
+        {
+            SNDDBG(("WAV: %d bits per sample!?\n", (int) fmt->wBitsPerSample));
+            BAIL_MACRO("WAV: Unsupported sample size.", 0);
+        } /* else */
     } /* else */
 
     BAIL_IF_MACRO(!read_fmt(rw, fmt), NULL, 0);
-    SDL_RWseek(rw, fmt->next_chunk_offset, SEEK_SET);
+    SDL_RWseek(rw, fmt->next_chunk_offset, RW_SEEK_SET);
     BAIL_IF_MACRO(!find_chunk(rw, dataID), "WAV: No data chunk.", 0);
     BAIL_IF_MACRO(!read_data_chunk(rw, &d), "WAV: Can't read data chunk.", 0);
 
@@ -743,7 +749,7 @@ static int WAV_rewind(Sound_Sample *sample)
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     wav_t *w = (wav_t *) internal->decoder_private;
     fmt_t *fmt = w->fmt;
-    int rc = SDL_RWseek(internal->rw, fmt->data_starting_offset, SEEK_SET);
+    int rc = SDL_RWseek(internal->rw, fmt->data_starting_offset, RW_SEEK_SET);
     BAIL_IF_MACRO(rc != fmt->data_starting_offset, ERR_IO_ERROR, 0);
     w->bytesLeft = fmt->total_bytes;
     return fmt->rewind_sample(sample);