*/
qboolean OGG_OpenLibrary (void)
{
- const char *dllname_vo, *dllname_vf;
+ const char* dllnames_vo [] =
+ {
+#if defined(WIN64)
+ "vorbis64.dll",
+#elif defined(WIN32)
+ "vorbis.dll",
+#elif defined(MACOSX)
+ "libvorbis.dylib",
+#else
+ "libvorbis.so.0",
+ "libvorbis.so",
+#endif
+ NULL
+ };
+ const char* dllnames_vf [] =
+ {
+#if defined(WIN64)
+ "vorbisfile64.dll",
+#elif defined(WIN32)
+ "vorbisfile.dll",
+#elif defined(MACOSX)
+ "libvorbisfile.dylib",
+#else
+ "libvorbisfile.so.3",
+ "libvorbisfile.so",
+#endif
+ NULL
+ };
// Already loaded?
if (vf_dll)
if (COM_CheckParm("-novorbis"))
return false;
-#ifdef WIN32
- dllname_vo = "vorbis.dll";
- dllname_vf = "vorbisfile.dll";
-#elif defined(MACOSX)
- dllname_vo = "libvorbis.dylib";
- dllname_vf = "libvorbisfile.dylib";
-#else
- dllname_vo = "libvorbis.so.0";
- dllname_vf = "libvorbisfile.so.3";
-#endif
-
// Load the DLLs
// We need to load both by hand because some OSes seem to not load
// the vorbis DLL automatically when loading the VorbisFile DLL
- if (! Sys_LoadLibrary (dllname_vo, &vo_dll, NULL) ||
- ! Sys_LoadLibrary (dllname_vf, &vf_dll, oggvorbisfuncs))
+ if (! Sys_LoadLibrary (dllnames_vo, &vo_dll, NULL) ||
+ ! Sys_LoadLibrary (dllnames_vf, &vf_dll, oggvorbisfuncs))
{
Sys_UnloadLibrary (&vo_dll);
Con_Printf ("Ogg Vorbis support disabled\n");
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
(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
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;
}
// 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;
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;