gosu 1.4.1 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a718ab538c3905dac47347a2ab8d60e62a971757f50b7b01c8b2da66c210513
-  data.tar.gz: 16867f7bb311a2bfed473d4eba4c4b326f27ce50fb52272864c78e6f94debb74
+  metadata.gz: 5f95c74e52e49585949f9d7f5c0af95bbd09ddee0738492fe8973a74a2430137
+  data.tar.gz: 8fbf827e6d76e83c3e67c51767538ced99470f9d578b324a8f53f045af282927
 SHA512:
-  metadata.gz: a3498f845869aa18765265ac725af104ab1320ca4b036cf4559382ac0e87b8d79efc9cdf43ab0ba6e2ba8e14653885a1e711e9fd1684c94411ee7fdcfe9fe0fd
-  data.tar.gz: 0d519c817a33644b2d9095a33a27814bcef61cde00a6335998a2e685740b728c952de4a7c3ff65b5145264d70d9629a6ea4541093063b570c16984f0cb560bad
+  metadata.gz: a75b9ac5f9bf1df4eef813199b05bc99d8645d622cb13c985331a5da70106a83641a064c186aaf0b8755a326832cb8033c77533a5bae51d3443c7dfa30681a7e
+  data.tar.gz: 683f1785588d95076f5878b7e8bc778393a60fbc2ed3427684d1e4bd041e600498735a1d66dba5bc4acf756cffa6637bb2ff5e2177a22bd3c9d9a5092a995459

data/dependencies/SDL_sound/SDL_sound.c

@@ -30,12 +30,11 @@ extern const Sound_DecoderFunctions __Sound_DecoderFunctions_VOC;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_RAW;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_SHN;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_FLAC;
-extern const Sound_DecoderFunctions __Sound_DecoderFunctions_QuickTime;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_CoreAudio;
 
 typedef struct
 {
-    int available;
+    SDL_bool available;
     const Sound_DecoderFunctions *funcs;
 } decoder_element;
 
@@ -85,17 +84,14 @@ static decoder_element decoders[] =
 
 /* General SDL_sound state ... */
 
-typedef struct __SOUND_ERRMSGTYPE__
+static SDL_TLSID tlsid_errmsg = 0;
+
+typedef struct
 {
-    Uint32 tid;
-    int error_available;
+    SDL_bool error_available;
     char error_string[128];
-    struct __SOUND_ERRMSGTYPE__ *next;
 } ErrMsg;
 
-static ErrMsg *error_msgs = NULL;
-static SDL_mutex *errorlist_mutex = NULL;
-
 static Sound_Sample *sample_list = NULL;  /* this is a linked list. */
 static SDL_mutex *samplelist_mutex = NULL;
 
@@ -124,7 +120,6 @@ int Sound_Init(void)
     BAIL_IF_MACRO(initialized, ERR_IS_INITIALIZED, 0);
 
     sample_list = NULL;
-    error_msgs = NULL;
 
     available_decoders = (const Sound_DecoderInfo **)
                             SDL_calloc(total, sizeof (Sound_DecoderInfo *));
@@ -132,7 +127,8 @@ int Sound_Init(void)
 
     SDL_InitSubSystem(SDL_INIT_AUDIO);
 
-    errorlist_mutex = SDL_CreateMutex();
+    tlsid_errmsg = SDL_TLSCreate();
+
     samplelist_mutex = SDL_CreateMutex();
 
     for (i = 0; decoders[i].funcs != NULL; i++)
@@ -152,8 +148,6 @@ int Sound_Init(void)
 
 int Sound_Quit(void)
 {
-    ErrMsg *err;
-    ErrMsg *nexterr = NULL;
     size_t i;
 
     BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0);
@@ -180,17 +174,7 @@ int Sound_Quit(void)
         SDL_free((void *) available_decoders);
     available_decoders = NULL;
 
-    /* clean up error state for each thread... */
-    SDL_LockMutex(errorlist_mutex);
-    for (err = error_msgs; err != NULL; err = nexterr)
-    {
-        nexterr = err->next;
-        SDL_free(err);
-    } /* for */
-    error_msgs = NULL;
-    SDL_UnlockMutex(errorlist_mutex);
-    SDL_DestroyMutex(errorlist_mutex);
-    errorlist_mutex = NULL;
+    tlsid_errmsg = 0;
 
     return 1;
 } /* Sound_Quit */
@@ -204,27 +188,8 @@ const Sound_DecoderInfo **Sound_AvailableDecoders(void)
 
 static ErrMsg *findErrorForCurrentThread(void)
 {
-    ErrMsg *i;
-    Uint32 tid;
-
-    if (error_msgs != NULL)
-    {
-        tid = SDL_ThreadID();
-
-        SDL_LockMutex(errorlist_mutex);
-        for (i = error_msgs; i != NULL; i = i->next)
-        {
-            if (i->tid == tid)
-            {
-                SDL_UnlockMutex(errorlist_mutex);
-                return i;
-            } /* if */
-        } /* for */
-        SDL_UnlockMutex(errorlist_mutex);
-    } /* if */
-
-    return NULL;   /* no error available. */
-} /* findErrorForCurrentThread */
+    return (ErrMsg *) SDL_TLSGet(tlsid_errmsg);
+}
 
 
 const char *Sound_GetError(void)
@@ -239,7 +204,7 @@ const char *Sound_GetError(void)
     if ((err != NULL) && (err->error_available))
     {
         retval = err->error_string;
-        err->error_available = 0;
+        err->error_available = SDL_FALSE;
     } /* if */
 
     return retval;
@@ -248,15 +213,14 @@ const char *Sound_GetError(void)
 
 void Sound_ClearError(void)
 {
-    ErrMsg *err;
+    Sound_GetError();  /* this will set error_available to SDL_FALSE */
+} /* Sound_ClearError */
 
-    if (!initialized)
-        return;
 
-    err = findErrorForCurrentThread();
-    if (err != NULL)
-        err->error_available = 0;
-} /* Sound_ClearError */
+static void SDLCALL free_errmsg(void *errmsg)
+{
+    SDL_free(errmsg);
+} /* free_errmsg */
 
 
 /*
@@ -269,8 +233,7 @@ void __Sound_SetError(const char *str)
     if (str == NULL)
         return;
 
-    SNDDBG(("__Sound_SetError(\"%s\");%s\n", str,
-              (initialized) ? "" : " [NOT INITIALIZED!]"));
+    SNDDBG(("__Sound_SetError(\"%s\");%s\n", str, (initialized) ? "" : " [NOT INITIALIZED!]"));
 
     if (!initialized)
         return;
@@ -282,15 +245,10 @@ void __Sound_SetError(const char *str)
         if (err == NULL)
             return;   /* uhh...? */
 
-        err->tid = SDL_ThreadID();
-
-        SDL_LockMutex(errorlist_mutex);
-        err->next = error_msgs;
-        error_msgs = err;
-        SDL_UnlockMutex(errorlist_mutex);
+        SDL_TLSSet(tlsid_errmsg, err, free_errmsg);
     } /* if */
 
-    err->error_available = 1;
+    err->error_available = SDL_TRUE;
     SDL_strlcpy(err->error_string, str, sizeof (err->error_string));
 } /* __Sound_SetError */
 
@@ -391,7 +349,7 @@ static int init_sample(const Sound_DecoderFunctions *funcs,
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     Sound_AudioInfo desired;
-    int pos = SDL_RWtell(internal->rw);
+    const Sint64 pos = SDL_RWtell(internal->rw);
 
         /* fill in the funcs for this decoder... */
     sample->decoder = &funcs->info;

data/dependencies/SDL_sound/SDL_sound.h

@@ -696,8 +696,8 @@ SNDDECLSPEC int SDLCALL Sound_Rewind(Sound_Sample *sample);
  *
  * This function can be emulated in the application with Sound_Rewind()
  *  and predecoding a specific amount of the sample, but this can be
- *  extremely inefficient. Sound_Seek() accelerates the seek on a
- *  with decoder-specific code.
+ *  extremely inefficient. Sound_Seek() accelerates the seek with
+ *  decoder-specific code.
  *
  * If this function fails, the sample should continue to function as if
  *  this call was never made. If there was an unrecoverable error,

data/dependencies/SDL_sound/SDL_sound_aiff.c

@@ -38,8 +38,8 @@ typedef struct S_AIFF_FMT_T
 {
     Uint32 type;
 
-    Uint32 total_bytes;
-    Uint32 data_starting_offset;
+    Sint64 total_bytes;
+    Sint64 data_starting_offset;
 
     void (*free)(struct S_AIFF_FMT_T *fmt);
     Uint32 (*read_sample)(Sound_Sample *sample);
@@ -49,7 +49,7 @@ typedef struct S_AIFF_FMT_T
 
 #if 0
 /*
-   this is ripped from wav.c as ann example of format-specific data.
+   this is ripped from wav.c as an example of format-specific data.
    please replace with something more appropriate when the need arises.
 */
     union
@@ -177,8 +177,7 @@ static int read_comm_chunk(SDL_RWops *rw, comm_t *comm)
         return 0;
     comm->numChannels = SDL_SwapBE16(comm->numChannels);
 
-    if (SDL_RWread(rw, &comm->numSampleFrames,
-                   sizeof (comm->numSampleFrames), 1) != 1)
+    if (SDL_RWread(rw, &comm->numSampleFrames, sizeof (comm->numSampleFrames), 1) != 1)
         return 0;
     comm->numSampleFrames = SDL_SwapBE32(comm->numSampleFrames);
 
@@ -245,7 +244,7 @@ static int read_ssnd_chunk(SDL_RWops *rw, ssnd_t *ssnd)
     ssnd->blockSize = SDL_SwapBE32(ssnd->blockSize);
 
     /* Leave the SDL_RWops position indicator at the start of the samples */
-    if (SDL_RWseek(rw, (int) ssnd->offset, RW_SEEK_CUR) == -1)
+    if (SDL_RWseek(rw, ssnd->offset, RW_SEEK_CUR) == -1)
         return 0;
 
     return 1;
@@ -262,8 +261,7 @@ static Uint32 read_sample_fmt_normal(Sound_Sample *sample)
     Uint32 retval;
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     aiff_t *a = (aiff_t *) internal->decoder_private;
-    Uint32 max = (internal->buffer_size < (Uint32) a->bytesLeft) ?
-                    internal->buffer_size : (Uint32) a->bytesLeft;
+    const Uint32 max = SDL_min(internal->buffer_size, (Uint32) a->bytesLeft);
 
     SDL_assert(max > 0);
 
@@ -301,10 +299,10 @@ static int seek_sample_fmt_normal(Sound_Sample *sample, Uint32 ms)
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     aiff_t *a = (aiff_t *) internal->decoder_private;
-    fmt_t *fmt = &a->fmt;
-    int offset = __Sound_convertMsToBytePos(&sample->actual, ms);
-    int pos = (int) (fmt->data_starting_offset + offset);
-    int rc = SDL_RWseek(internal->rw, pos, RW_SEEK_SET);
+    const fmt_t *fmt = &a->fmt;
+    const Uint32 offset = __Sound_convertMsToBytePos(&sample->actual, ms);
+    const Sint64 pos = (Sint64) (fmt->data_starting_offset + offset);
+    const Sint64 rc = SDL_RWseek(internal->rw, pos, RW_SEEK_SET);
     BAIL_IF_MACRO(rc != pos, ERR_IO_ERROR, 0);
     a->bytesLeft = fmt->total_bytes - offset;
     return 1;  /* success. */
@@ -334,9 +332,9 @@ static int read_fmt_normal(SDL_RWops *rw, fmt_t *fmt)
  * Everything else...                                                        *
  *****************************************************************************/
 
-static int AIFF_init(void)
+static SDL_bool AIFF_init(void)
 {
-    return 1;  /* always succeeds. */
+    return SDL_TRUE;  /* always succeeds. */
 } /* AIFF_init */
 
 
@@ -393,8 +391,8 @@ static int AIFF_open(Sound_Sample *sample, const char *ext)
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     SDL_RWops *rw = internal->rw;
     Uint32 chunk_id;
-    int bytes_per_sample;
-    long pos;
+    Uint32 bytes_per_sample;
+    Sint64 pos;
     comm_t c;
     ssnd_t s;
     aiff_t *a;
@@ -413,14 +411,11 @@ static int AIFF_open(Sound_Sample *sample, const char *ext)
     BAIL_IF_MACRO(!read_comm_chunk(rw, &c),
                   "AIFF: Can't read common chunk.", 0);
 
+    BAIL_IF_MACRO(c.numChannels == 0, "AIFF: no channels specified.", 0);
+
     sample->actual.channels = (Uint8) c.numChannels;
     sample->actual.rate = c.sampleRate;
 
-    /* Really, sample->total_time = (c.numSampleFrames*1000) c.sampleRate */
-    internal->total_time = (c.numSampleFrames / c.sampleRate) * 1000;
-    internal->total_time += (c.numSampleFrames % c.sampleRate)
-                             *  1000 / c.sampleRate;
-
     if (c.sampleSize <= 8)
     {
         sample->actual.format = AUDIO_S8;
@@ -461,6 +456,14 @@ static int AIFF_open(Sound_Sample *sample, const char *ext)
         BAIL_MACRO("AIFF: Can't read sound data chunk.", 0);
     } /* if */
 
+    if (c.numSampleFrames == 0)
+        c.numSampleFrames = (s.ckDataSize - 8) / bytes_per_sample;
+
+    /* Really, sample->total_time = (c.numSampleFrames*1000) c.sampleRate */
+    internal->total_time = (c.numSampleFrames / c.sampleRate) * 1000;
+    internal->total_time += (c.numSampleFrames % c.sampleRate) *  1000 / c.sampleRate;
+
+
     a->fmt.total_bytes = a->bytesLeft = bytes_per_sample * c.numSampleFrames;
     a->fmt.data_starting_offset = SDL_RWtell(rw);
     internal->decoder_private = (void *) a;
@@ -493,8 +496,8 @@ static int AIFF_rewind(Sound_Sample *sample)
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     aiff_t *a = (aiff_t *) internal->decoder_private;
-    fmt_t *fmt = &a->fmt;
-    int rc = SDL_RWseek(internal->rw, fmt->data_starting_offset, RW_SEEK_SET);
+    const fmt_t *fmt = &a->fmt;
+    const Sint64 rc = SDL_RWseek(internal->rw, fmt->data_starting_offset, RW_SEEK_SET);
     BAIL_IF_MACRO(rc != fmt->data_starting_offset, ERR_IO_ERROR, 0);
     a->bytesLeft = fmt->total_bytes;
     return fmt->rewind_sample(sample);

data/dependencies/SDL_sound/SDL_sound_au.c

@@ -18,9 +18,9 @@
 #if SOUND_SUPPORTS_AU
 
 /* no init/deinit needed */
-static int AU_init(void)
+static SDL_bool AU_init(void)
 {
-    return 1;
+    return SDL_TRUE;
 } /* AU_init */
 
 static void AU_quit(void)
@@ -63,7 +63,7 @@ struct audec
 {
     Uint32 total;
     Uint32 remaining;
-    Uint32 start_offset;
+    Sint64 start_offset;
     int encoding;
 };
 
@@ -297,7 +297,7 @@ static int AU_rewind(Sound_Sample *sample)
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     struct audec *dec = (struct audec *) internal->decoder_private;
-    int rc = SDL_RWseek(internal->rw, dec->start_offset, RW_SEEK_SET);
+    const Sint64 rc = SDL_RWseek(internal->rw, dec->start_offset, RW_SEEK_SET);
     BAIL_IF_MACRO(rc != dec->start_offset, ERR_IO_ERROR, 0);
     dec->remaining = dec->total;
     return 1;
@@ -308,14 +308,14 @@ static int AU_seek(Sound_Sample *sample, Uint32 ms)
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     struct audec *dec = (struct audec *) internal->decoder_private;
-    int offset = __Sound_convertMsToBytePos(&sample->actual, ms);
-    int rc;
-    int pos;
+    Sint64 offset = __Sound_convertMsToBytePos(&sample->actual, ms);
+    Sint64 rc;
+    Sint64 pos;
 
     if (dec->encoding == AU_ENC_ULAW_8)
         offset >>= 1;  /* halve the byte offset for compression. */
 
-    pos = (int) (dec->start_offset + offset);
+    pos = (dec->start_offset + offset);
     rc = SDL_RWseek(internal->rw, pos, RW_SEEK_SET);
     BAIL_IF_MACRO(rc != pos, ERR_IO_ERROR, 0);
     dec->remaining = dec->total - offset;

data/dependencies/SDL_sound/SDL_sound_coreaudio.c

@@ -23,9 +23,9 @@ typedef struct CoreAudioFileContainer
 } CoreAudioFileContainer;
 
 
-static int CoreAudio_init(void)
+static SDL_bool CoreAudio_init(void)
 {
-    return 1;  /* always succeeds. */
+    return SDL_TRUE;  /* always succeeds. */
 } /* CoreAudio_init */
 
 
@@ -193,11 +193,10 @@ static const char* CoreAudio_FourCCToString(int32_t error_code)
 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, RW_SEEK_END);
+	const Sint64 current_position = SDL_RWtell(rw_ops);
+	const 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;
 }
 

data/dependencies/SDL_sound/SDL_sound_flac.c

@@ -29,17 +29,24 @@
 #define DR_FLAC_IMPLEMENTATION
 #define DR_FLAC_NO_STDIO 1
 #define DR_FLAC_NO_WIN32_IO 1
-#define DR_FLAC_NO_CRC 1
 #define DRFLAC_ASSERT(x) SDL_assert((x))
 #define DRFLAC_MALLOC(sz) SDL_malloc((sz))
 #define DRFLAC_REALLOC(p, sz) SDL_realloc((p), (sz))
 #define DRFLAC_FREE(p) SDL_free((p))
 #define DRFLAC_COPY_MEMORY(dst, src, sz) SDL_memcpy((dst), (src), (sz))
 #define DRFLAC_ZERO_MEMORY(p, sz) SDL_memset((p), 0, (sz))
+#ifndef __WATCOMC__ /* #@!.!.. */
+#if SDL_VERSION_ATLEAST(2, 0, 9)
+#define exp SDL_exp
+#endif
+#define floor SDL_floor
+#endif
+
 #include "dr_flac.h"
 
 static size_t flac_read(void* pUserData, void* pBufferOut, size_t bytesToRead)
 {
+    /* !!! FIXME: dr_flac treats returning less than bytesToRead as EOF. So we can't EAGAIN. */
     Uint8 *ptr = (Uint8 *) pBufferOut;
     Sound_Sample *sample = (Sound_Sample *) pUserData;
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
@@ -47,24 +54,13 @@ static size_t flac_read(void* pUserData, void* pBufferOut, size_t bytesToRead)
     size_t retval = 0;
 
     /* !!! FIXME: dr_flac treats returning less than bytesToRead as EOF. So we can't EAGAIN. */
-    while (retval < bytesToRead)
+    while (bytesToRead)
     {
         const size_t rc = SDL_RWread(rwops, ptr, 1, bytesToRead);
-        if (rc == 0)
-        {
-            sample->flags |= SOUND_SAMPLEFLAG_EOF;
-            break;
-        } /* if */
-        else if (rc == -1) /** FIXME: this error check is broken **/
-        {
-            sample->flags |= SOUND_SAMPLEFLAG_ERROR;
-            break;
-        } /* else if */
-        else
-        {
-            retval += rc;
-            ptr += rc;
-        } /* else */
+        if (rc == 0) break;
+        bytesToRead -= rc;
+        retval += rc;
+        ptr += rc;
     } /* while */
 
     return retval;
@@ -79,9 +75,9 @@ static drflac_bool32 flac_seek(void* pUserData, int offset, drflac_seek_origin o
 } /* flac_seek */
 
 
-static int FLAC_init(void)
+static SDL_bool FLAC_init(void)
 {
-    return 1;  /* always succeeds. */
+    return SDL_TRUE;  /* always succeeds. */
 } /* FLAC_init */
 
 
@@ -94,7 +90,7 @@ static void FLAC_quit(void)
 static int FLAC_open(Sound_Sample *sample, const char *ext)
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
-    drflac *dr = drflac_open(flac_read, flac_seek, sample);
+    drflac *dr = drflac_open(flac_read, flac_seek, sample, NULL);
 
     if (!dr)
     {
@@ -109,14 +105,14 @@ static int FLAC_open(Sound_Sample *sample, const char *ext)
     sample->actual.rate = dr->sampleRate;
     sample->actual.format = AUDIO_S32SYS;  /* dr_flac only does Sint32. */
 
-    if (dr->totalSampleCount == 0)
+    if (dr->totalPCMFrameCount == 0)
         internal->total_time = -1;
     else
     {
         const Uint32 rate = (Uint32) dr->sampleRate;
-        const Uint64 frames = (Uint64) (dr->totalSampleCount / dr->channels);
+        const Uint64 frames = (Uint64) dr->totalPCMFrameCount;
         internal->total_time = (frames / rate) * 1000;
-        internal->total_time += ((dr->totalSampleCount % dr->sampleRate) * 1000) / dr->sampleRate;
+        internal->total_time += ((dr->totalPCMFrameCount % dr->sampleRate) * 1000) / dr->sampleRate;
     } /* else */
 
     internal->decoder_private = dr;
@@ -134,17 +130,21 @@ static void FLAC_close(Sound_Sample *sample)
 static Uint32 FLAC_read(Sound_Sample *sample)
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
+    const int channels = (int) sample->actual.channels;
     drflac *dr = (drflac *) internal->decoder_private;
-    const drflac_uint64 rc = drflac_read_s32(dr, internal->buffer_size / sizeof (drflac_int32), (drflac_int32 *) internal->buffer);
-    /* !!! FIXME: the flac_read callback sets ERROR and EOF flags, but this only tells you about i/o errors, not corruption. */
-    return rc * sizeof (drflac_int32);
+    const drflac_uint64 frames_to_read = (internal->buffer_size / channels) / sizeof (drflac_int32);
+    const drflac_uint64 rc = drflac_read_pcm_frames_s32(dr, frames_to_read, (drflac_int32 *) internal->buffer);
+    /* !!! FIXME: we only set the EOF flags, but this only tells you we're done, not about i/o errors, nor corruption. */
+    if (rc < frames_to_read)
+        sample->flags |= SOUND_SAMPLEFLAG_EOF;
+    return rc * channels * sizeof (drflac_int32);
 } /* FLAC_read */
 
 static int FLAC_rewind(Sound_Sample *sample)
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     drflac *dr = (drflac *) internal->decoder_private;
-    return (drflac_seek_to_sample(dr, 0) == DRFLAC_TRUE);
+    return (drflac_seek_to_pcm_frame(dr, 0) == DRFLAC_TRUE);
 } /* FLAC_rewind */
 
 static int FLAC_seek(Sound_Sample *sample, Uint32 ms)
@@ -153,8 +153,7 @@ static int FLAC_seek(Sound_Sample *sample, Uint32 ms)
     drflac *dr = (drflac *) internal->decoder_private;
     const float frames_per_ms = ((float) sample->actual.rate) / 1000.0f;
     const drflac_uint64 frame_offset = (drflac_uint64) (frames_per_ms * ((float) ms));
-    const drflac_uint64 sampnum = frame_offset * sample->actual.channels;
-    return (drflac_seek_to_sample(dr, sampnum) == DRFLAC_TRUE);
+    return (drflac_seek_to_pcm_frame(dr, frame_offset) == DRFLAC_TRUE);
 } /* FLAC_seek */
 
 static const char *extensions_flac[] = { "FLAC", "FLA", NULL };
@@ -179,4 +178,3 @@ const Sound_DecoderFunctions __Sound_DecoderFunctions_FLAC =
 #endif /* SOUND_SUPPORTS_FLAC */
 
 /* end of SDL_sound_flac.c ... */
-

data/dependencies/SDL_sound/SDL_sound_internal.h

@@ -97,16 +97,16 @@ typedef struct __SOUND_DECODERFUNCTIONS__
          *  set up any global state that your decoder needs, such as
          *  initializing an external library, etc.
          *
-         * Return non-zero if initialization is successful, zero if there's
-         *  a fatal error. If this method fails, then this decoder is
-         *  flagged as unavailable until SDL_sound() is shut down and
+         * Return SDL_TRUE if initialization is successful, SDL_FALSE if
+         *  there's a fatal error. If this method fails, then this decoder
+         *  is flagged as unavailable until SDL_sound() is shut down and
          *  reinitialized, in which case this method will be tried again.
          *
          * Note that the decoders quit() method won't be called if this
          *  method fails, so if you can't intialize, you'll have to clean
          *  up the half-initialized state in this method.
          */
-    int (*init)(void);
+    SDL_bool (*init)(void);
 
         /*
          * This is called during the Sound_Quit() function. Use this to

data/dependencies/SDL_sound/SDL_sound_modplug.c

@@ -56,7 +56,7 @@ static const char *extensions_modplug[] =
 
 
 
-static int MODPLUG_init(void)
+static SDL_bool MODPLUG_init(void)
 {
     return ModPlug_Init();  /* success. */
 } /* MODPLUG_init */

data/dependencies/SDL_sound/SDL_sound_mp3.c

@@ -20,7 +20,6 @@
 #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))
@@ -30,6 +29,12 @@
 #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))
+#ifndef __WATCOMC__ /* #@!.!.. */
+#if SDL_VERSION_ATLEAST(2, 0, 9)
+#define exp SDL_exp
+#endif
+#define floor SDL_floor
+#endif
 
 #include "dr_mp3.h"
 
@@ -42,24 +47,13 @@ static size_t mp3_read(void* pUserData, void* pBufferOut, size_t bytesToRead)
     size_t retval = 0;
 
     /* !!! FIXME: dr_mp3 treats returning less than bytesToRead as EOF. So we can't EAGAIN. */
-    while (retval < bytesToRead)
+    while (bytesToRead)
     {
         const size_t rc = SDL_RWread(rwops, ptr, 1, bytesToRead);
-        if (rc == 0)
-        {
-            sample->flags |= SOUND_SAMPLEFLAG_EOF;
-            break;
-        } /* if */
-        else if (rc == -1) /** FIXME: this error check is broken **/
-        {
-            sample->flags |= SOUND_SAMPLEFLAG_ERROR;
-            break;
-        } /* else if */
-        else
-        {
-            retval += rc;
-            ptr += rc;
-        } /* else */
+        if (rc == 0) break;
+        bytesToRead -= rc;
+        retval += rc;
+        ptr += rc;
     } /* while */
 
     return retval;
@@ -74,9 +68,9 @@ static drmp3_bool32 mp3_seek(void* pUserData, int offset, drmp3_seek_origin orig
 } /* mp3_seek */
 
 
-static int MP3_init(void)
+static SDL_bool MP3_init(void)
 {
-    return 1;  /* always succeeds. */
+    return SDL_TRUE;  /* always succeeds. */
 } /* MP3_init */
 
 
@@ -125,8 +119,10 @@ static Uint32 MP3_read(Sound_Sample *sample)
     const int channels = (int) sample->actual.channels;
     drmp3 *dr = (drmp3 *) internal->decoder_private;
     const drmp3_uint64 frames_to_read = (internal->buffer_size / channels) / sizeof (float);
-    const drmp3_uint64 rc = drmp3_read_f32(dr, frames_to_read, (float *) internal->buffer);
-    /* !!! FIXME: the mp3_read callback sets ERROR and EOF flags, but this only tells you about i/o errors, not corruption. */
+    const drmp3_uint64 rc = drmp3_read_pcm_frames_f32(dr, frames_to_read, (float *) internal->buffer);
+    /* !!! FIXME: we only set the EOF flags, but this only tells you we're done, not about i/o errors, nor corruption. */
+    if (rc < frames_to_read)
+        sample->flags |= SOUND_SAMPLEFLAG_EOF;
     return rc * channels * sizeof (float);
 } /* MP3_read */
 
@@ -134,7 +130,7 @@ static int MP3_rewind(Sound_Sample *sample)
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     drmp3 *dr = (drmp3 *) internal->decoder_private;
-    return (drmp3_seek_to_frame(dr, 0) == DRMP3_TRUE);
+    return (drmp3_seek_to_pcm_frame(dr, 0) == DRMP3_TRUE);
 } /* MP3_rewind */
 
 static int MP3_seek(Sound_Sample *sample, Uint32 ms)
@@ -143,7 +139,7 @@ static int MP3_seek(Sound_Sample *sample, Uint32 ms)
     drmp3 *dr = (drmp3 *) internal->decoder_private;
     const float frames_per_ms = ((float) sample->actual.rate) / 1000.0f;
     const drmp3_uint64 frame_offset = (drmp3_uint64) (frames_per_ms * ((float) ms));
-    return (drmp3_seek_to_frame(dr, frame_offset) == DRMP3_TRUE);
+    return (drmp3_seek_to_pcm_frame(dr, frame_offset) == DRMP3_TRUE);
 } /* MP3_seek */
 
 /* dr_mp3 will play layer 1 and 2 files, too */