gosu 1.4.1 → 1.4.3

data/dependencies/SDL_sound/SDL_sound_raw.c

@@ -28,9 +28,9 @@
 
 #if SOUND_SUPPORTS_RAW
 
-static int RAW_init(void)
+static SDL_bool RAW_init(void)
 {
-    return 1;  /* always succeeds. */
+    return SDL_TRUE;  /* always succeeds. */
 } /* RAW_init */
 
 
@@ -80,8 +80,7 @@ static int RAW_open(Sound_Sample *sample, const char *ext)
         BAIL_MACRO("RAW: can't reset file.", 0);
     }
 
-    sample_rate =  (sample->actual.rate * sample->actual.channels
-      * ( (sample->actual.format & 0x0018) >> 3) );
+    sample_rate = (sample->actual.rate * sample->actual.channels * ((sample->actual.format & 0x0018) >> 3));
     internal->total_time = ( pos ) / sample_rate * 1000;
     internal->total_time += (pos % sample_rate) * 1000 / sample_rate;
 
@@ -133,8 +132,8 @@ static int RAW_rewind(Sound_Sample *sample)
 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, RW_SEEK_SET) != pos);
+    const Sint64 pos = __Sound_convertMsToBytePos(&sample->actual, ms);
+    const 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

@@ -57,7 +57,7 @@ typedef struct
     Uint8 *backBuffer;
     Uint32 backBufferSize;
     Uint32 backBufLeft;
-    Uint32 start_pos;
+    Sint64 start_pos;
 } shn_t;
 
 
@@ -282,9 +282,9 @@ static SDL_INLINE int uint_get(int nbit, shn_t *shn, SDL_RWops *rw, Sint32 *w)
 } /* uint_get */
 
 
-static int SHN_init(void)
+static SDL_bool SHN_init(void)
 {
-    return 1;  /* initialization always successful. */
+    return SDL_TRUE;  /* initialization always successful. */
 } /* SHN_init */
 
 
@@ -1257,7 +1257,7 @@ static int SHN_rewind(Sound_Sample *sample)
 
 #if 0
     shn_t *shn = (shn_t *) internal->decoder_private;
-    int rc = SDL_RWseek(internal->rw, shn->start_pos, RW_SEEK_SET);
+    Sint64 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;

data/dependencies/SDL_sound/SDL_sound_voc.c

@@ -39,7 +39,7 @@ typedef struct vocstuff {
     Uint8   channels;       /* number of sound channels */
     int     extended;       /* Has an extended block been read? */
     Uint32  bufpos;         /* byte position in internal->buffer. */
-    Uint32  start_pos;      /* offset to seek to in stream when rewinding. */
+    Sint64  start_pos;      /* offset to seek to in stream when rewinding. */
     int     error;          /* error condition (as opposed to EOF). */
 } vs_t;
 
@@ -77,9 +77,9 @@ typedef struct vocstuff {
 #define VOC_DATA_16   9
 
 
-static int VOC_init(void)
+static SDL_bool VOC_init(void)
 {
-    return 1;  /* always succeeds. */
+    return SDL_TRUE;  /* always succeeds. */
 } /* VOC_init */
 
 
@@ -191,8 +191,7 @@ static int voc_get_block(Sound_Sample *sample, vs_t *v)
                 v->rest = sblen - 2;
                 v->size = ST_SIZE_BYTE;
 
-                bytes_per_second = sample->actual.rate
-                    * sample->actual.channels;
+                bytes_per_second = sample->actual.rate * sample->actual.channels;
                 internal->total_time += ( v->rest ) / bytes_per_second * 1000;
                 internal->total_time += (v->rest % bytes_per_second) * 1000
                                             / bytes_per_second;
@@ -342,7 +341,7 @@ static int voc_read_waveform(Sound_Sample *sample, int fill_buf, Uint32 max)
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     SDL_RWops *src = internal->rw;
     vs_t *v = (vs_t *) internal->decoder_private;
-    int done = 0;
+    Sint64 done = 0;
     Uint8 silence = 0x80;
     Uint8 *buf = internal->buffer;
 
@@ -355,7 +354,8 @@ static int voc_read_waveform(Sound_Sample *sample, int fill_buf, Uint32 max)
     if (v->rest == 0)
         return 0;
 
-    max = (v->rest < max) ? v->rest : max;
+    if (v->rest < max)
+        max = v->rest;
 
     if (v->silent)
     {
@@ -366,8 +366,8 @@ static int voc_read_waveform(Sound_Sample *sample, int fill_buf, Uint32 max)
         if (fill_buf)
             SDL_memset(buf + v->bufpos, silence, max);
 
-        done = max;
-        v->rest -= done;
+        done = (Sint64) max;
+        v->rest -= max;
     } /* if */
 
     else
@@ -375,7 +375,7 @@ static int voc_read_waveform(Sound_Sample *sample, int fill_buf, Uint32 max)
         if (fill_buf)
         {
             done = SDL_RWread(src, buf + v->bufpos, 1, max);
-            if (done < max)
+            if (done < ((Sint64) max))
             {
                 __Sound_SetError("VOC: i/o error");
                 sample->flags |= SOUND_SAMPLEFLAG_ERROR;
@@ -384,7 +384,7 @@ static int voc_read_waveform(Sound_Sample *sample, int fill_buf, Uint32 max)
 
         else
         {
-            int cur, rc;
+            Sint64 cur, rc;
             cur = SDL_RWtell(src);
             if (cur >= 0)
             {
@@ -482,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, RW_SEEK_SET);
+    const Sint64 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;
@@ -503,9 +503,9 @@ static int VOC_seek(Sound_Sample *sample, Uint32 ms)
 
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     vs_t *v = (vs_t *) internal->decoder_private;
-    int offset = __Sound_convertMsToBytePos(&sample->actual, ms);
-    int origpos = SDL_RWtell(internal->rw);
-    int origrest = v->rest;
+    Uint32 offset = __Sound_convertMsToBytePos(&sample->actual, ms);
+    const Sint64 origpos = SDL_RWtell(internal->rw);
+    const Uint32 origrest = v->rest;
 
     BAIL_IF_MACRO(!VOC_rewind(sample), NULL, 0);
 

data/dependencies/SDL_sound/SDL_sound_vorbis.c

@@ -52,13 +52,20 @@
 #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
+#ifndef __WATCOMC__ /* #@!.!.. */
+#define pow SDL_pow
+#define floor SDL_floor
+#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)
+#if SDL_VERSION_ATLEAST(2, 0, 9)
+#define exp SDL_exp
 #endif
-#define alloca(x) ((void *) SDL_stack_alloc(Uint8, (x)))
-*/
 #endif
+#endif
+
 #include "stb_vorbis.h"
 
 static const char *vorbis_error_string(const int err)
@@ -90,9 +97,9 @@ static const char *vorbis_error_string(const int err)
     return "VORBIS: unknown error";
 } /* vorbis_error_string */
 
-static int VORBIS_init(void)
+static SDL_bool VORBIS_init(void)
 {
-    return 1;  /* always succeeds. */
+    return SDL_TRUE;  /* always succeeds. */
 } /* VORBIS_init */
 
 static void VORBIS_quit(void)

data/dependencies/SDL_sound/SDL_sound_wav.c

@@ -99,10 +99,10 @@ typedef struct S_WAV_FMT_T
     Uint16 wBlockAlign;
     Uint16 wBitsPerSample;
 
-    Uint32 next_chunk_offset;
+    Sint64 next_chunk_offset;
     
     Uint32 sample_frame_size;
-    Uint32 data_starting_offset;
+    Sint64 data_starting_offset;
     Uint32 total_bytes;
 
     void (*free)(struct S_WAV_FMT_T *fmt);
@@ -243,9 +243,9 @@ static int seek_sample_fmt_normal(Sound_Sample *sample, Uint32 ms)
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     wav_t *w = (wav_t *) internal->decoder_private;
     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, RW_SEEK_SET);
+    const Sint64 offset = __Sound_convertMsToBytePos(&sample->actual, ms);
+    const Sint64 pos = (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);
     w->bytesLeft = fmt->total_bytes - offset;
     return 1;  /* success. */
@@ -490,13 +490,13 @@ static int seek_sample_fmt_adpcm(Sound_Sample *sample, Uint32 ms)
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     wav_t *w = (wav_t *) internal->decoder_private;
     fmt_t *fmt = w->fmt;
-    Uint32 origsampsleft = fmt->fmt.adpcm.samples_left_in_block;
-    int origpos = SDL_RWtell(internal->rw);
-    int offset = __Sound_convertMsToBytePos(&sample->actual, 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, RW_SEEK_SET);
+    const Uint32 origsampsleft = fmt->fmt.adpcm.samples_left_in_block;
+    const Sint64 origpos = SDL_RWtell(internal->rw);
+    const Sint64 offset = __Sound_convertMsToBytePos(&sample->actual, ms);
+    const Sint64 bpb = (fmt->fmt.adpcm.wSamplesPerBlock * fmt->sample_frame_size);
+    Sint64 skipsize = (offset / bpb) * fmt->wBlockAlign;
+    const Sint64 pos = skipsize + fmt->data_starting_offset;
+    Sint64 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. */
@@ -573,9 +573,9 @@ static int read_fmt_adpcm(SDL_RWops *rw, fmt_t *fmt)
  * Everything else...                                                        *
  *****************************************************************************/
 
-static int WAV_init(void)
+static SDL_bool WAV_init(void)
 {
-    return 1;  /* always succeeds. */
+    return SDL_TRUE;  /* always succeeds. */
 } /* WAV_init */
 
 
@@ -619,7 +619,7 @@ static int find_chunk(SDL_RWops *rw, Uint32 id)
 {
     Sint32 siz = 0;
     Uint32 _id = 0;
-    Uint32 pos = SDL_RWtell(rw);
+    Sint64 pos = SDL_RWtell(rw);
 
     while (1)
     {
@@ -627,7 +627,7 @@ static int find_chunk(SDL_RWops *rw, Uint32 id)
         if (_id == id)
             return 1;
 
-            /* skip ahead and see what next chunk is... */
+        /* skip ahead and see what next chunk is... */
         BAIL_IF_MACRO(!read_le32s(rw, &siz), NULL, 0);
         SDL_assert(siz >= 0);
         pos += (sizeof (Uint32) * 2) + siz;
@@ -749,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, RW_SEEK_SET);
+    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);
     w->bytesLeft = fmt->total_bytes;
     return fmt->rewind_sample(sample);