don't try to send entities with a NAN origin (this is strangely crashing the PVS...

[xonotic/darkplaces.git] / snd_ogg.c

diff --git a/snd_ogg.c b/snd_ogg.c
index 6139019832269a53babbb1087d8e012cde2b4b3d..a342f4a809d4285bac8435647b671521d6301971 100644 (file)
--- a/snd_ogg.c
+++ b/snd_ogg.c
@@ -296,7 +296,9 @@ qboolean OGG_OpenLibrary (void)
 {
        const char* dllnames_vo [] =
        {
-#ifdef WIN32
+#if defined(WIN64)
+               "vorbis64.dll",
+#elif defined(WIN32)
                "vorbis.dll",
 #elif defined(MACOSX)
                "libvorbis.dylib",
@@ -308,7 +310,9 @@ qboolean OGG_OpenLibrary (void)
        };
        const char* dllnames_vf [] =
        {
-#ifdef WIN32
+#if defined(WIN64)
+               "vorbisfile64.dll",
+#elif defined(WIN32)
                "vorbisfile.dll",
 #elif defined(MACOSX)
                "libvorbisfile.dylib",
@@ -452,26 +456,24 @@ static const sfxbuffer_t* OGG_FetchSound (channel_t* ch, unsigned int start, uns
        if (sb->offset <= start && sb->offset + sb->length >= start + nbsamples)
                return sb;
 
-       newlength = sb->offset + sb->length - start;
+       newlength = (int)(sb->offset + sb->length) - start;
 
        // If we need to skip some data before decompressing the rest, or if the stream has looped
        if (newlength < 0 || sb->offset > start)
        {
                if (qov_pcm_seek (&per_ch->vf, (ogg_int64_t)start) != 0)
                        return NULL;
-
-               sb->offset = start;
                sb->length = 0;
-               newlength = 0;
        }
        // Else, move forward the samples we need to keep in the sfxbuffer
        else
        {
                memmove (sb->data, sb->data + (start - sb->offset) * factor, newlength * factor);
-               sb->offset = start;
                sb->length = newlength;
        }
 
+       sb->offset = start;
+
        // We add exactly 1 sec of sound to the buffer:
        // 1- to ensure we won't lose any sample during the resampling process
        // 2- to force one call to OGG_FetchSound per second to regulate the workload
@@ -481,7 +483,7 @@ static const sfxbuffer_t* OGG_FetchSound (channel_t* ch, unsigned int start, uns
                                        (sfx->format.speed + sb->length) * factor, buff_len);
                return NULL;
        }
-       newlength = per_sfx->format.speed * factor;  // 1 sec of sound before resampling
+       newlength = per_sfx->format.speed * factor;  // -> 1 sec of sound before resampling
 
        // Decompress in the resampling_buffer
 #if BYTE_ORDER == LITTLE_ENDIAN
@@ -494,8 +496,8 @@ static const sfxbuffer_t* OGG_FetchSound (channel_t* ch, unsigned int start, uns
                done += ret;
 
        // Resample in the sfxbuffer
-       newlength = ResampleSfx (resampling_buffer, (size_t)done / factor, &per_sfx->format, sb->data + sb->length * factor, sfx->name);
-       sb->length += newlength;
+       newlength = (int)ResampleSfx (resampling_buffer, (size_t)done / (size_t)factor, &per_sfx->format, sb->data + sb->length * (size_t)factor, sfx->name);
+       sb->length += newlength;
 
        return sb;
 }
@@ -581,7 +583,7 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *s)
 
        // Decide if we go for a stream or a simple PCM cache
        buff_len = ceil (STREAM_BUFFER_DURATION * (shm->format.speed * 2 * vi->channels));
-       if (snd_streaming.integer && len > fs_filesize + 3 * buff_len)
+       if (snd_streaming.integer && len > (ogg_int64_t)fs_filesize + 3 * buff_len)
        {
                ogg_stream_persfx_t* per_sfx;
 
@@ -638,7 +640,7 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *s)
                s->loopstart = -1;
                s->flags &= ~SFXFLAG_STREAMED;
 
-               sb->length = ResampleSfx (buff, (size_t)done / (vi->channels * 2), &s->format, sb->data, s->name);
+               sb->length = (unsigned int)ResampleSfx (buff, (size_t)done / (vi->channels * 2), &s->format, sb->data, s->name);
                s->format.speed = shm->format.speed;
                s->total_length = sb->length;
                sb->offset = 0;